Identifier

Dark-Tater · Aug 27, 2017 · cf66e33 · cf66e33
1 parent f64cff6
commit cf66e33
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/source/Spruce/Tokens/AlphaNum.cs b/source/Spruce/Tokens/AlphaNum.cs
@@ -2,8 +2,9 @@
 {
     public class AlphaNum : Token
     {
+        public AlphaNum() : this("") { }
         // First char cannot be digit
-        public AlphaNum() : base(Chars.AlphaNum, Chars.Alpha) { }
+        public AlphaNum(string aExtraChars, string aExtraFirstChars = "") : base(aExtraChars + Chars.Digit, aExtraFirstChars + Chars.Digit) { }
 
         public override object Check(string aText)
         {

diff --git a/source/Spruce/Tokens/Compound.cs b/source/Spruce/Tokens/Compound.cs
@@ -14,7 +14,8 @@ public class Compound : Token {
         public override object Parse(string aText, ref int rStart) {
             int xOrigStart = rStart;
             foreach (var xToken in mInternals) {
-                if (xToken.Check(aText) == null) {
+                if (xToken.Parse(aText, ref rStart) == null) {
+                    rStart = xOrigStart;
                     return null;
                 }
             }

diff --git a/source/XSharp/Tokens/Identifier.cs b/source/XSharp/Tokens/Identifier.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace XSharp.Tokens {
+    public class Identifier : Spruce.Tokens.AlphaNum {
+        public Identifier() : base("_", "_") {
+        }
+    }
+}