Merge pull request #1 from deaz/sequence-dictionary-whitespaces

Add support for whitespaces in sequence and dictionary declarations
aikoven · Jan 16, 2018 · ab59da9 · ab59da9
2 parents d616eb9 + 1736d0d
commit ab59da9
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 9 deletions.
diff --git a/fixtures/dictionary.ice b/fixtures/dictionary.ice
@@ -0,0 +1,11 @@
+#pragma once
+
+module A {
+    struct Struct {};
+
+    dictionary   <string, Struct> StructMap;
+    dictionary
+    <string, Struct> StructMap2;
+    dictionary	<string, Struct> StructMap3; // there is a tab between `dictionary` and `<`
+    dictionary<string, Struct> StructMap4;
+};
diff --git a/fixtures/sequence.ice b/fixtures/sequence.ice
@@ -0,0 +1,11 @@
+#pragma once
+
+module A {
+    struct Struct {};
+
+    sequence   <Struct> StructSeq;
+    sequence
+    <Struct> StructSeq2;
+    sequence	<Struct> StructSeq3; // there is a tab between `sequence` and `<`
+    sequence<Struct> StructSeq4;
+};
diff --git a/src/__snapshots__/slice.spec.ts.snap b/src/__snapshots__/slice.spec.ts.snap
@@ -19502,6 +19502,68 @@ Object {
 }
 `;
 
+exports[`Slices dictionary.ice 1`] = `
+Object {
+  "globalMetadata": undefined,
+  "includes": undefined,
+  "modules": Array [
+    Object {
+      "content": Array [
+        Object {
+          "doc": undefined,
+          "fields": Array [],
+          "local": undefined,
+          "metadata": undefined,
+          "name": "Struct",
+          "type": "struct",
+        },
+        Object {
+          "doc": undefined,
+          "keyType": "string",
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructMap",
+          "type": "dictionary",
+          "valueType": "Struct",
+        },
+        Object {
+          "doc": undefined,
+          "keyType": "string",
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructMap2",
+          "type": "dictionary",
+          "valueType": "Struct",
+        },
+        Object {
+          "doc": undefined,
+          "keyType": "string",
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructMap3",
+          "type": "dictionary",
+          "valueType": "Struct",
+        },
+        Object {
+          "doc": undefined,
+          "keyType": "string",
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructMap4",
+          "type": "dictionary",
+          "valueType": "Struct",
+        },
+      ],
+      "doc": undefined,
+      "metadata": undefined,
+      "name": "A",
+      "type": "module",
+    },
+  ],
+  "pragmaOnce": true,
+}
+`;
+
 exports[`Slices optional-return-type.ice 1`] = `
 Object {
   "globalMetadata": undefined,
@@ -19540,3 +19602,61 @@ Object {
   "pragmaOnce": true,
 }
 `;
+
+exports[`Slices sequence.ice 1`] = `
+Object {
+  "globalMetadata": undefined,
+  "includes": undefined,
+  "modules": Array [
+    Object {
+      "content": Array [
+        Object {
+          "doc": undefined,
+          "fields": Array [],
+          "local": undefined,
+          "metadata": undefined,
+          "name": "Struct",
+          "type": "struct",
+        },
+        Object {
+          "dataType": "Struct",
+          "doc": undefined,
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructSeq",
+          "type": "sequence",
+        },
+        Object {
+          "dataType": "Struct",
+          "doc": undefined,
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructSeq2",
+          "type": "sequence",
+        },
+        Object {
+          "dataType": "Struct",
+          "doc": undefined,
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructSeq3",
+          "type": "sequence",
+        },
+        Object {
+          "dataType": "Struct",
+          "doc": undefined,
+          "local": undefined,
+          "metadata": undefined,
+          "name": "StructSeq4",
+          "type": "sequence",
+        },
+      ],
+      "doc": undefined,
+      "metadata": undefined,
+      "name": "A",
+      "type": "module",
+    },
+  ],
+  "pragmaOnce": true,
+}
+`;
diff --git a/src/slice.ohm b/src/slice.ohm
@@ -44,9 +44,9 @@ Slice {
   EnumElement = identifier EnumValue?
   EnumValue = "=" (decimalIntegerLiteral | typeId)
 
-  SequenceDeclaration = Metadata? localModifier? "sequence<" dataType ">" identifier ";"
+  SequenceDeclaration = Metadata? localModifier? "sequence" "<" dataType ">" identifier ";"
 
-  DictionaryDeclaration = Metadata? localModifier? "dictionary<" dataType "," dataType ">" identifier ";"
+  DictionaryDeclaration = Metadata? localModifier? "dictionary" "<" dataType "," dataType ">" identifier ";"
 
   ConstDeclaration = "const" dataType identifier DefaultValue ";"
 
@@ -155,4 +155,4 @@ Slice {
           | "exception"	| "local" | "short"
 
   primitiveType = "bool" | "string" | "byte" | "int" | "long" | "float" | "double" | "short"
-}
+}
diff --git a/src/slice.ts b/src/slice.ts
@@ -327,10 +327,11 @@ const sliceSemantics = sliceGrammar.createSemantics().addOperation('toJson', {
     metadataNode,
     localModifierNode,
     t1,
-    dataTypeNode,
     t2,
-    identifierNode,
+    dataTypeNode,
     t3,
+    identifierNode,
+    t4,
   ): types.SequenceDeclaration {
     const [metadata] = metadataNode.toJson();
     const [local] = localModifierNode.toJson();
@@ -350,12 +351,13 @@ const sliceSemantics = sliceGrammar.createSemantics().addOperation('toJson', {
     metadataNode,
     localModifierNode,
     t1,
-    keyTypeNode,
     t2,
-    valueTypeNode,
+    keyTypeNode,
     t3,
-    identifierNode,
+    valueTypeNode,
     t4,
+    identifierNode,
+    t5,
   ): types.DictionaryDeclaration {
     const [metadata] = metadataNode.toJson();
     const [local] = localModifierNode.toJson();
@@ -494,4 +496,4 @@ export function parse(source: string): types.SliceSource {
   }
 
   return sliceSemantics(res).toJson();
-}
+}