C-style identifiers in peg.ebnf

diff --git a/basis/peg/ebnf/ebnf-tests.factor b/basis/peg/ebnf/ebnf-tests.factor
index accbec6fd72041ca769bb75c1274d36daf163978..897746a9c963d7c8c66d9753100345cdf273e231 100644 (file)
--- a/basis/peg/ebnf/ebnf-tests.factor
+++ b/basis/peg/ebnf/ebnf-tests.factor
@@ -539,20 +539,6 @@ Tok                = Spaces (Number | Special )
 [
     { "a" "a" }
 ] [
-    EBNF: foo2   Bar = "a":1a "a":2a => [[ 1a 2a 2array ]] ;EBNF
+    EBNF: foo2   Bar = "a":a-1 "a":a-2 => [[ a-1 a-2 2array ]] ;EBNF
     "aa" foo2
 ] unit-test
-
-[
-    { "a" "a" }
-] [
-    EBNF: foo3   Bar = "a":11 "a":22 => [[ 11 22 2array ]] ;EBNF
-    "aa" foo3
-] unit-test
-
-[
-    { "a" "a" }
-] [
-    EBNF: foo4   Bar = "a":a-1 "a":a-2 => [[ a-1 a-2 2array ]] ;EBNF
-    "aa" foo4
-] unit-test

diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 29123b7126696aeea603543c46120a5b49d126ef..b682f582add9e8420bd959a2a7b72a23aea1b913 100644 (file)
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -230,7 +230,11 @@ DEFER: 'action'
 \r
 : 'element' ( -- parser )\r
   [\r
-    [ ('element') , ":" syntax , "(a-zA-Z0-9_-)+" range-pattern repeat1 [ >string ] action , ] seq* [ first2 <ebnf-var> ] action ,\r
+    [\r
+      ('element') , ":" syntax ,\r
+      "a-zA-Z_" range-pattern\r
+      "a-zA-Z0-9_-" range-pattern repeat1 2seq [ first2 swap prefix >string ] action ,\r
+    ] seq* [ first2 <ebnf-var> ] action ,\r
     ('element') ,\r
   ] choice* ;\r
 \r