allow numbers in identifiers

ghost-language · Oct 27, 2023 · a6c7e09 · a6c7e09
1 parent f35b017
commit a6c7e09
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/examples/scratch.ghost b/examples/scratch.ghost
@@ -8,4 +8,10 @@ data = {
 }
 
 print(data.name)
-print(data.handler(6))
+print(data.handler(6))
+
+function test1() {
+  print('test1')
+}
+
+test1()
diff --git a/scanner/scanner.go b/scanner/scanner.go
@@ -377,7 +377,7 @@ func isEmpty(character rune) bool {
 
 // isIdentifier tells us if the passed character can be used in a valid identifier.
 func isIdentifier(character rune) bool {
-	return !isDigit(character) && !isWhitespace(character) && !isBrace(character) && !isBracket(character) && !isParenthesis(character) && !isOperator(character) && !isCompound(character) && !isComparison(character) && !isEmpty(character)
+	return !isWhitespace(character) && !isBrace(character) && !isBracket(character) && !isParenthesis(character) && !isOperator(character) && !isCompound(character) && !isComparison(character) && !isEmpty(character)
 }
 
 // lookupIdentifier looks up the string in the list of keywords and returns its

diff --git a/scanner/scanner_test.go b/scanner/scanner_test.go
@@ -14,7 +14,7 @@ func TestScanTokens(t *testing.T) {
 			expectedLexeme string
 		}
 	}{
-		`( ) [ ] { } , . - + ; * % ? : > < >= <= ! != = == "hello world" 42 3.14 6.67428e-11 foo foobar true false class whilefoo こんにちは 世界 += -= *= /= import from as ..`,
+		`( ) [ ] { } , . - + ; * % ? : > < >= <= ! != = == "hello world" 42 3.14 6.67428e-11 foo foobar hello1 true false class whilefoo こんにちは 世界 += -= *= /= import from as ..`,
 		[]struct {
 			expectedType   token.Type
 			expectedLexeme string
@@ -48,6 +48,7 @@ func TestScanTokens(t *testing.T) {
 			{token.NUMBER, "6.67428e-11"},
 			{token.IDENTIFIER, "foo"},
 			{token.IDENTIFIER, "foobar"},
+			{token.IDENTIFIER, "hello1"},
 			{token.TRUE, "true"},
 			{token.FALSE, "false"},
 			{token.CLASS, "class"},