Add dotted names to AST.

See #422.
bigeasy · Apr 16, 2020 · 177255b · 177255b
1 parent 1ad24c7
commit 177255b
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 2 deletions.
diff --git a/simplified.js b/simplified.js
@@ -242,8 +242,10 @@ function map (definitions, packet, depth, extra = {}) {
             } else if (depth == 0) {
                 // TODO It's not depth == 0, more like start of structure.
                 const fields = []
-                for (const field in packet) {
-                    fields.push.apply(fields, map(definitions, packet[field], 1, { name: field }))
+                for (const name in packet) {
+                    fields.push.apply(fields, map(definitions, packet[name], 1, {
+                        name, dotted: `.${name}`
+                    }))
                 }
                 const fixed = fields.reduce((fixed, field) => {
                     return fixed && field.fixed

diff --git a/test/language/compiled/minimal.json b/test/language/compiled/minimal.json
@@ -6,6 +6,7 @@
   "fields": [
     {
       "name": "value",
+      "dotted": ".value",
       "type": "integer",
       "endianness": "big",
       "fixed": true,

diff --git a/test/language/conditional.t.js b/test/language/conditional.t.js
@@ -19,6 +19,7 @@ require('proof')(1, okay => {
         type: 'structure',
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'conditional',
             fixed: false,
             bits: 0,

diff --git a/test/language/length-encoded-fixed.t.js b/test/language/length-encoded-fixed.t.js
@@ -8,13 +8,15 @@ require('proof')(1, okay => {
         lengthEncoded: true,
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoding',
             fixed: true,
             bits: 16,
             endianness: 'big',
             compliment: false
         }, {
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoded',
             fixed: false,
             bits: 0,
@@ -24,13 +26,15 @@ require('proof')(1, okay => {
                 fixed: true,
                 fields: [{
                     name: 'first',
+                    dotted: '.first',
                     type: 'integer',
                     fixed: true,
                     bits: 16,
                     endianness: 'big',
                     compliment: false
                 }, {
                     name: 'second',
+                    dotted: '.second',
                     type: 'integer',
                     fixed: true,
                     bits: 16,

diff --git a/test/language/length-encoded-variable.t.js b/test/language/length-encoded-variable.t.js
@@ -8,13 +8,15 @@ require('proof')(1, okay => {
         lengthEncoded: true,
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoding',
             fixed: true,
             bits: 16,
             endianness: 'big',
             compliment: false
         }, {
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoded',
             fixed: false,
             bits: 0,
@@ -24,13 +26,15 @@ require('proof')(1, okay => {
                 fixed: false,
                 fields: [{
                     name: 'first',
+                    dotted: '.first',
                     type: 'lengthEncoding',
                     fixed: true,
                     bits: 16,
                     endianness: 'big',
                     compliment: false
                 }, {
                     name: 'first',
+                    dotted: '.first',
                     type: 'lengthEncoded',
                     fixed: false,
                     bits: 0,

diff --git a/test/language/length-encoded.t.js b/test/language/length-encoded.t.js
@@ -8,13 +8,15 @@ require('proof')(1, okay => {
         lengthEncoded: true,
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoding',
             fixed: true,
             bits: 16,
             endianness: 'big',
             compliment: false
         }, {
             name: 'value',
+            dotted: '.value',
             type: 'lengthEncoded',
             fixed: false,
             bits: 0,

diff --git a/test/language/literal.t.js b/test/language/literal.t.js
@@ -12,6 +12,7 @@ require('proof')(1, okay => {
             value: '0faded'
         }, {
             name: 'value',
+            dotted: '.value',
             type: 'integer',
             fixed: true,
             bits: 16,

diff --git a/test/language/little-endian.t.js b/test/language/little-endian.t.js
@@ -7,6 +7,7 @@ require('proof')(1, okay => {
         type: 'structure',
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'integer',
             fixed: true,
             bits: 16,

diff --git a/test/language/minimal.t.js b/test/language/minimal.t.js
@@ -7,6 +7,7 @@ require('proof')(1, okay => {
         type: 'structure',
         fields: [{
             name: 'value',
+            dotted: '.value',
             type: 'integer',
             fixed: true,
             bits: 16,