add inline identifiers

examples/all.d2

@@ -1,2 +1,7 @@
-a
+a <- b -- b
-b
+
+foo: Hello world {
+  shape: oval
+}
+
+hello world- -- foo

grammar.js

@@ -21,9 +21,17 @@ module.exports = grammar({
         $._end
       ),
 
-    shape: ($) => seq($.identifier, optional(seq(":", $.label)), $._end),
+    shape: ($) =>
+      seq(
+        $.identifier,
+        repeat(seq($.dot, $.identifier)),
+        optional(seq(":", $.label)),
+        $._end
+      ),
 
-    label: ($) => choice($.string, /[^\n;{]+/),
+    dot: ($) => ".",
+
+    label: ($) => choice($.string, $._unquoted_string),
 
     identifier: ($) => $._identifier,
 
@@ -35,6 +43,8 @@ module.exports = grammar({
         seq(repeat("-"), "->")
       ),
 
+    _unquoted_string: ($) => /[^\n;{]+/,
+
     string: ($) =>
       choice(
         seq("'", repeat(token(/[^'\n]+/)), "'"),

src/grammar.json

@@ -106,6 +106,22 @@
           "type": "SYMBOL",
           "name": "identifier"
         },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "dot"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
+          }
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -133,6 +149,10 @@
         }
       ]
     },
+    "dot": {
+      "type": "STRING",
+      "value": "."
+    },
     "label": {
       "type": "CHOICE",
       "members": [
@@ -141,8 +161,8 @@
           "name": "string"
         },
         {
-          "type": "PATTERN",
+          "type": "SYMBOL",
-          "value": "[^\\n;{]+"
+          "name": "_unquoted_string"
         }
       ]
     },
@@ -223,6 +243,10 @@
         }
       ]
     },
+    "_unquoted_string": {
+      "type": "PATTERN",
+      "value": "[^\\n;{]+"
+    },
     "string": {
       "type": "CHOICE",
       "members": [

src/node-types.json

@@ -55,6 +55,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "dot",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
@@ -133,5 +137,9 @@
   {
     "type": "`",
     "named": false
+  },
+  {
+    "type": "dot",
+    "named": true
   }
 ]

src/scanner.c

@@ -28,6 +28,7 @@ static bool scan_identifier(TSLexer *lexer) {
         case ':':
         case ';':
         case '<':
+        case '.':
         case '\n':
         case '\0':
           return has_content;

test/corpus/shape.txt

@@ -26,6 +26,22 @@ Complex identifier
   (shape (identifier))
 )
 
+==================
+Inline shapes
+==================
+
+foo.baz
+
+---
+
+(source_file
+  (shape
+    (identifier)
+    (dot)
+    (identifier)
+  )
+)
+
 
 ==================
 Many shapes inline