Add in support for boolean, character, and symbol literals. (#22)

* This adds in support for boolean, character, and symbol literals. Previously we would just handle boolean literals and character literals as identifiers, and wouldn't handle symbol literals. * Fix CI
tree-sitter · Apr 1, 2021 · fb23ed9 · fb23ed9
1 parent f7721fd
commit fb23ed9
Show file tree

Hide file tree

Showing 7 changed files with 39,953 additions and 36,927 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
 name: Build/test
 on:
   push:
+  pull_request:
     branches:
       - master
-    pull_request:
 jobs:
   test:
     runs-on: ${{ matrix.os }}

diff --git a/corpus/definitions.txt b/corpus/definitions.txt
@@ -417,6 +417,6 @@ def mkLines(header: String, indented: Boolean = false, embraced: Boolean = false
     (identifier)
     (parameters
       (parameter (identifier) (type_identifier))
-      (parameter (identifier) (type_identifier) (identifier))
-      (parameter (identifier) (type_identifier) (identifier)))
+      (parameter (identifier) (type_identifier) (boolean_literal))
+      (parameter (identifier) (type_identifier) (boolean_literal)))
     (type_identifier) (block)))
diff --git a/corpus/literals.txt b/corpus/literals.txt
@@ -64,3 +64,69 @@ val string = 3.14
 
 (compilation_unit
   (val_definition (identifier) (number)))
+
+==========================
+Boolean literals
+==========================
+
+val myBool = true
+
+def foo(a: Boolean = false) = a && true
+
+---
+
+(compilation_unit
+  (val_definition (identifier) (boolean_literal))
+  (function_definition
+    (identifier)
+    (parameters (parameter
+      (identifier)
+      (type_identifier)
+      (boolean_literal)))
+    (infix_expression
+      (identifier)
+      (operator_identifier)
+      (boolean_literal))))
+
+==========================
+Character literals
+==========================
+
+val myChar = 'c'
+
+val otherChar = '\u0041'
+
+val anotherChar = '\n'
+
+def foo(a: Char = 'c') = a + 'd'
+
+---
+
+(compilation_unit
+  (val_definition (identifier) (character_literal))
+  (val_definition (identifier) (character_literal))
+  (val_definition (identifier) (character_literal))
+  (function_definition
+    (identifier)
+    (parameters (parameter
+      (identifier)
+      (type_identifier)
+      (character_literal)))
+    (infix_expression
+      (identifier)
+      (operator_identifier)
+      (character_literal))))
+
+==========================
+Symobl literals
+==========================
+
+val mySymbol = 'c
+
+val myOtherSymbol = 'thing
+
+---
+
+(compilation_unit
+  (val_definition (identifier) (symbol_literal))
+  (val_definition (identifier) (symbol_literal)))
diff --git a/grammar.js b/grammar.js
@@ -454,6 +454,9 @@ module.exports = grammar({
       $.alternative_pattern,
       $.typed_pattern,
       $.number,
+      $.boolean_literal,
+      $.character_literal,
+      $.symbol_literal,
       $.string,
       $.wildcard
     ),
@@ -519,6 +522,9 @@ module.exports = grammar({
       $.block,
       $.identifier,
       $.number,
+      $.boolean_literal,
+      $.character_literal,
+      $.symbol_literal,
       $.string
     ),
 
@@ -640,6 +646,27 @@ module.exports = grammar({
 
     number: $ => /[\d\.]+/,
 
+    boolean_literal: $ => choice('true', 'false'),
+
+   character_literal: $ => token(seq(
+      '\'',
+      optional(choice(
+        seq('\\', choice(
+          /[^xu]/,
+          /u[0-9a-fA-F]{4}/,
+          /u{[0-9a-fA-F]+}/,
+          /x[0-9a-fA-F]{2}/
+        )),
+        /[^\\'\n]/
+      )),
+      '\''
+    )),
+
+    symbol_literal: $ => token(seq(
+      "'",
+      repeat1(/[^\\'\n]/)
+    )),
+
     interpolated_string_expression: $ => seq(
       $.identifier,
       $.interpolated_string

diff --git a/src/grammar.json b/src/grammar.json
@@ -2384,6 +2384,18 @@
           "type": "SYMBOL",
           "name": "number"
         },
+        {
+          "type": "SYMBOL",
+          "name": "boolean_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "character_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "symbol_literal"
+        },
         {
           "type": "SYMBOL",
           "name": "string"
@@ -2686,6 +2698,18 @@
           "type": "SYMBOL",
           "name": "number"
         },
+        {
+          "type": "SYMBOL",
+          "name": "boolean_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "character_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "symbol_literal"
+        },
         {
           "type": "SYMBOL",
           "name": "string"
@@ -3338,6 +3362,101 @@
       "type": "PATTERN",
       "value": "[\\d\\.]+"
     },
+    "boolean_literal": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "true"
+        },
+        {
+          "type": "STRING",
+          "value": "false"
+        }
+      ]
+    },
+    "character_literal": {
+      "type": "TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "'"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "\\"
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "PATTERN",
+                            "value": "[^xu]"
+                          },
+                          {
+                            "type": "PATTERN",
+                            "value": "u[0-9a-fA-F]{4}"
+                          },
+                          {
+                            "type": "PATTERN",
+                            "value": "u{[0-9a-fA-F]+}"
+                          },
+                          {
+                            "type": "PATTERN",
+                            "value": "x[0-9a-fA-F]{2}"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "[^\\\\'\\n]"
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
+          {
+            "type": "STRING",
+            "value": "'"
+          }
+        ]
+      }
+    },
+    "symbol_literal": {
+      "type": "TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "'"
+          },
+          {
+            "type": "REPEAT1",
+            "content": {
+              "type": "PATTERN",
+              "value": "[^\\\\'\\n]"
+            }
+          }
+        ]
+      }
+    },
     "interpolated_string_expression": {
       "type": "SEQ",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -69,6 +69,10 @@
         "type": "block",
         "named": true
       },
+      {
+        "type": "boolean_literal",
+        "named": true
+      },
       {
         "type": "call_expression",
         "named": true
@@ -77,6 +81,10 @@
         "type": "case_block",
         "named": true
       },
+      {
+        "type": "character_literal",
+        "named": true
+      },
       {
         "type": "field_expression",
         "named": true
@@ -125,6 +133,10 @@
         "type": "string",
         "named": true
       },
+      {
+        "type": "symbol_literal",
+        "named": true
+      },
       {
         "type": "try_expression",
         "named": true
@@ -143,6 +155,10 @@
         "type": "alternative_pattern",
         "named": true
       },
+      {
+        "type": "boolean_literal",
+        "named": true
+      },
       {
         "type": "capture_pattern",
         "named": true
@@ -151,6 +167,10 @@
         "type": "case_class_pattern",
         "named": true
       },
+      {
+        "type": "character_literal",
+        "named": true
+      },
       {
         "type": "identifier",
         "named": true
@@ -167,6 +187,10 @@
         "type": "string",
         "named": true
       },
+      {
+        "type": "symbol_literal",
+        "named": true
+      },
       {
         "type": "tuple_pattern",
         "named": true
@@ -298,6 +322,11 @@
       ]
     }
   },
+  {
+    "type": "boolean_literal",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "call_expression",
     "named": true,
@@ -3154,6 +3183,10 @@
     "type": "catch",
     "named": false
   },
+  {
+    "type": "character_literal",
+    "named": true
+  },
   {
     "type": "class",
     "named": false
@@ -3174,6 +3207,10 @@
     "type": "extends",
     "named": false
   },
+  {
+    "type": "false",
+    "named": false
+  },
   {
     "type": "final",
     "named": false
@@ -3242,10 +3279,18 @@
     "type": "sealed",
     "named": false
   },
+  {
+    "type": "symbol_literal",
+    "named": true
+  },
   {
     "type": "trait",
     "named": false
   },
+  {
+    "type": "true",
+    "named": false
+  },
   {
     "type": "try",
     "named": false