bug fix with packed attribute

vaguue · May 18, 2024 · 2df8877 · 2df8877
1 parent 5c2c8b9
commit 2df8877
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/visitor.js b/src/visitor.js
@@ -93,7 +93,7 @@ export class StructVisitor extends BaseCstVisitor {
     const tokens = this.visit(ctx.bracketExpression, { isAttr: true });
     const res = {};
     for (let i = 0; i < tokens.length; ++i) {
-      if (tokens[i] == '__packed__') {
+      if (tokens[i] == 'packed' || tokens[i] == '__packed__') {
         res.packed = true;
       }
       if (tokens[i] == 'aligned' || tokens[i] == '__aligned__') {

diff --git a/test/data/traversed-more-features.json b/test/data/traversed-more-features.json
@@ -1 +1 @@
-[{"name":"Example1","attributes":{"packed":true,"aligned":4},"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"int","vars":[{"name":"v","d":[]}],"meta":{"BE":true},"comment":"@BE this value will be big-endian"},{"type":"unsigned long","vars":[{"name":"da","d":[]}],"meta":{}}],"meta":{}},{"name":"Example2","attributes":{"packed":true},"members":[{"type":"char","vars":[{"name":"name","d":[16]}],"meta":{}},{"type":"double","vars":[{"name":"dbl","d":[]}],"meta":{}},{"type":"int *","vars":[{"name":"p","d":[]}],"meta":{}},{"type":"uint32_t *","vars":[{"name":"da","d":[0]}],"meta":{}}],"meta":{"NE":true},"comment":"@NE"},{"name":"Example3","attributes":null,"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"double","vars":[{"name":"m","d":[16,16]}],"meta":{}}],"meta":{}},{"name":"Example4","attributes":{},"members":[{"type":"uint8_t","vars":[{"name":"version","d":[],"bits":4},{"name":"headerLength","d":[],"bits":4},{"name":"something","d":[],"bits":3}],"meta":{}},{"type":"uint8_t","vars":[{"name":"typeOfService","d":[]}],"meta":{}}],"meta":{}}]
+[{"name":"Example1","attributes":{"packed":true,"aligned":4},"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"int","vars":[{"name":"v","d":[]}],"meta":{"BE":true},"comment":"@BE this value will be big-endian"},{"type":"unsigned long","vars":[{"name":"da","d":[]}],"meta":{}}],"meta":{}},{"name":"Example2","attributes":{"packed":true},"members":[{"type":"char","vars":[{"name":"name","d":[16]}],"meta":{}},{"type":"double","vars":[{"name":"dbl","d":[]}],"meta":{}},{"type":"int *","vars":[{"name":"p","d":[]}],"meta":{}},{"type":"uint32_t *","vars":[{"name":"da","d":[0]}],"meta":{}}],"meta":{"NE":true},"comment":"@NE"},{"name":"Example3","attributes":null,"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"double","vars":[{"name":"m","d":[16,16]}],"meta":{}}],"meta":{}},{"name":"Example4","attributes":{"packed":true},"members":[{"type":"uint8_t","vars":[{"name":"version","d":[],"bits":4},{"name":"headerLength","d":[],"bits":4},{"name":"something","d":[],"bits":3}],"meta":{}},{"type":"uint8_t","vars":[{"name":"typeOfService","d":[]}],"meta":{}}],"meta":{}}]
diff --git a/test/visitor.test.js b/test/visitor.test.js
@@ -90,7 +90,7 @@ test('visitor', (t) => {
       name: 'Example3'
     },
     {
-      attributes: {},
+      attributes: { packed: true },
       members: [
         {
           meta: {},
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"name":"Example1","attributes":{"packed":true,"aligned":4},"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"int","vars":[{"name":"v","d":[]}],"meta":{"BE":true},"comment":"@BE this value will be big-endian"},{"type":"unsigned long","vars":[{"name":"da","d":[]}],"meta":{}}],"meta":{}},{"name":"Example2","attributes":{"packed":true},"members":[{"type":"char","vars":[{"name":"name","d":[16]}],"meta":{}},{"type":"double","vars":[{"name":"dbl","d":[]}],"meta":{}},{"type":"int ","vars":[{"name":"p","d":[]}],"meta":{}},{"type":"uint32_t ","vars":[{"name":"da","d":[0]}],"meta":{}}],"meta":{"NE":true},"comment":"@NE"},{"name":"Example3","attributes":null,"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"double","vars":[{"name":"m","d":[16,16]}],"meta":{}}],"meta":{}},{"name":"Example4","attributes":{},"members":[{"type":"uint8_t","vars":[{"name":"version","d":[],"bits":4},{"name":"headerLength","d":[],"bits":4},{"name":"something","d":[],"bits":3}],"meta":{}},{"type":"uint8_t","vars":[{"name":"typeOfService","d":[]}],"meta":{}}],"meta":{}}]
		[{"name":"Example1","attributes":{"packed":true,"aligned":4},"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"int","vars":[{"name":"v","d":[]}],"meta":{"BE":true},"comment":"@BE this value will be big-endian"},{"type":"unsigned long","vars":[{"name":"da","d":[]}],"meta":{}}],"meta":{}},{"name":"Example2","attributes":{"packed":true},"members":[{"type":"char","vars":[{"name":"name","d":[16]}],"meta":{}},{"type":"double","vars":[{"name":"dbl","d":[]}],"meta":{}},{"type":"int ","vars":[{"name":"p","d":[]}],"meta":{}},{"type":"uint32_t ","vars":[{"name":"da","d":[0]}],"meta":{}}],"meta":{"NE":true},"comment":"@NE"},{"name":"Example3","attributes":null,"members":[{"type":"uint8_t","vars":[{"name":"c","d":[]}],"meta":{}},{"type":"double","vars":[{"name":"m","d":[16,16]}],"meta":{}}],"meta":{}},{"name":"Example4","attributes":{"packed":true},"members":[{"type":"uint8_t","vars":[{"name":"version","d":[],"bits":4},{"name":"headerLength","d":[],"bits":4},{"name":"something","d":[],"bits":3}],"meta":{}},{"type":"uint8_t","vars":[{"name":"typeOfService","d":[]}],"meta":{}}],"meta":{}}]