Handle Int nodes.

package.json

@@ -29,7 +29,7 @@
   "homepage": "https://github.com/indutny/llparse-frontend#readme",
   "dependencies": {
     "debug": "^3.2.6",
-    "llparse-builder": "^1.3.2"
+    "llparse-builder": "git+https://github.com/arthurschreiber/llparse-builder.git#arthur/binary-parsing"
   },
   "devDependencies": {
     "@types/debug": "0.0.30",

src/container/index.ts

@@ -45,6 +45,7 @@ export class Container {
       Consume: this.combine((impl) => impl.node.Consume),
       Empty: this.combine((impl) => impl.node.Empty),
       Error: this.combine((impl) => impl.node.Error),
+      Int: this.combine((impl) => impl.node.Int),
       Invoke: this.combine((impl) => impl.node.Invoke),
       Pause: this.combine((impl) => impl.node.Pause),
       Sequence: this.combine((impl) => impl.node.Sequence),

src/frontend.ts

@@ -163,6 +163,8 @@ export class Frontend {
     } else if (node instanceof source.node.Consume) {
       result = new nodeImpl.Consume(
         new frontend.node.Consume(id(), node.field));
+    } else if (node instanceof source.node.Int) {
+      result = this.translateInt(node);
     } else if (node instanceof source.node.SpanStart) {
       result = new nodeImpl.SpanStart(
         new frontend.node.SpanStart(id(), this.spanMap.get(node.span)!,
@@ -184,27 +186,37 @@ export class Frontend {
 
     // Initialize result
     const otherwise = node.getOtherwiseEdge();
-
     if (Array.isArray(result)) {
-      assert(node instanceof source.node.Match);
-      const match = node as source.node.Match;
+      assert(node instanceof source.node.Match || node instanceof source.node.Int);
 
-      // TODO(indutny): move this to llparse-builder?
-      assert.notStrictEqual(otherwise, undefined,
-        `Node "${node.name}" has no \`.otherwise()\``);
+      if (node instanceof source.node.Match) {
+        // TODO(indutny): move this to llparse-builder?
+        assert.notStrictEqual(otherwise, undefined,
+          `Node "${node.name}" has no \`.otherwise()\``);
 
-      // Assign otherwise to every node of Trie
-      if (otherwise !== undefined) {
+        // Assign otherwise to every node of Trie
+        if (otherwise !== undefined) {
+          for (const child of result) {
+            child.ref.setOtherwise(this.translate(otherwise.node),
+              otherwise.noAdvance);
+          }
+        }
+
+        // Assign transform to every node of Trie
+        const transform = this.translateTransform(node.getTransform());
         for (const child of result) {
-          child.ref.setOtherwise(this.translate(otherwise.node),
-            otherwise.noAdvance);
+          child.ref.setTransform(transform);
         }
-      }
+      } else if (node instanceof source.node.Int) {
+        // TODO(indutny): move this to llparse-builder?
+        assert.notStrictEqual(otherwise, undefined,
+          `Node "${node.name}" has no \`.otherwise()\``);
 
-      // Assign transform to every node of Trie
-      const transform = this.translateTransform(match.getTransform());
-      for (const child of result) {
-        child.ref.setTransform(transform);
+        // Assign otherwise to last node of int expansion
+        if (otherwise !== undefined) {
+          result[result.length - 1].ref.setOtherwise(this.translate(otherwise.node),
+            otherwise.noAdvance)
+        }
       }
 
       assert(result.length >= 1);
@@ -256,6 +268,31 @@ export class Frontend {
     }
   }
 
+  private translateInt(node: source.node.Int) : ReadonlyArray<IWrap<frontend.node.Node>> {
+    const { name, field, bytes, signed, littleEndian } = node;
+
+    let result = [
+      new this.implementation.node.Int(
+        new frontend.node.Int(this.id.id(name), field, bytes, signed, littleEndian, 0)
+      )
+    ];
+
+    // Break loops
+    this.map.set(node, result[0]);
+
+    let next = result[0];
+    for (let offset = 1; offset < node.bytes; offset++) {
+      result[offset] = new this.implementation.node.Int(
+        new frontend.node.Int(this.id.id(name + '_byte' + (offset + 1)), field, bytes, signed, littleEndian, offset)
+      );
+
+      next.ref.setOtherwise(result[offset], false);
+      next = result[offset];
+    }
+
+    return result;
+  }
+
   private translateMatch(node: source.node.Match): MatchResult {
     const trie = new Trie(node.name);
 

src/implementation/node.ts

@@ -5,6 +5,7 @@ export interface INodeImplementation {
   readonly Consume: new(n: node.Consume) => IWrap<node.Consume>;
   readonly Empty: new(n: node.Empty) => IWrap<node.Empty>;
   readonly Error: new(n: node.Error) => IWrap<node.Error>;
+  readonly Int: new(n: node.Int) => IWrap<node.Int>;
   readonly Invoke: new(n: node.Invoke) => IWrap<node.Invoke>;
   readonly Pause: new(n: node.Pause) => IWrap<node.Pause>;
   readonly Sequence: new(n: node.Sequence) => IWrap<node.Sequence>;

src/node/index.ts

@@ -2,6 +2,7 @@ export * from './base';
 export * from './consume';
 export * from './empty';
 export * from './error';
+export * from './int';
 export * from './invoke';
 export * from './match';
 export * from './pause';

src/node/int.ts

@@ -0,0 +1,8 @@
+import { IUniqueName } from '../utils';
+import { Node } from './base';
+
+export class Int extends Node {
+  constructor(id: IUniqueName, readonly field: string, public readonly bytes: number, public readonly signed: boolean, public readonly littleEndian: boolean, public readonly byteOffset: number) {
+    super(id);
+  }
+}