Merge pull request #9 from nickel-lang/identifier-extend

Add ' to valid identifier characters
nickel-lang · Jun 21, 2022 · 9a502ea · 9a502ea
2 parents c4dd142 + 29a8dbe
commit 9a502ea
Show file tree

Hide file tree

Showing 4 changed files with 146 additions and 58 deletions.
diff --git a/corpus/basic.txt b/corpus/basic.txt
@@ -44,6 +44,38 @@ a-b
 
 --------------------------------------------------------------------------------
 
+(term
+  (uni_term
+    (infix_expr
+      (applicative
+        (record_operand
+          (atom
+            (ident)))))))
+
+================================================================================
+identifier with '
+================================================================================
+
+a'
+
+--------------------------------------------------------------------------------
+
+(term
+  (uni_term
+    (infix_expr
+      (applicative
+        (record_operand
+          (atom
+            (ident)))))))
+
+================================================================================
+identifier with _
+================================================================================
+
+_a_''''_'_
+
+--------------------------------------------------------------------------------
+
 (term
   (uni_term
     (infix_expr

diff --git a/grammar.js b/grammar.js
@@ -66,7 +66,7 @@ module.exports = grammar({
 
     num_literal: _ => /[0-9]*\.?[0-9]+/,
 
-    ident: _ => /_?[a-zA-Z][_a-zA-Z0-9-]*/,
+    ident: _ => /_?[a-zA-Z][_a-zA-Z0-9-']*/,
 
     ////////////////////////////
     // PARSER RULES (grammar.lalrpop)

diff --git a/src/grammar.json b/src/grammar.json
@@ -19,7 +19,7 @@
     },
     "ident": {
       "type": "PATTERN",
-      "value": "_?[a-zA-Z][_a-zA-Z0-9-]*"
+      "value": "_?[a-zA-Z][_a-zA-Z0-9-']*"
     },
     "annot_atom": {
       "type": "CHOICE",