Merge pull request #59 from skx/58-lexer-names

Be less strict about identifier names.

lexer/lexer.go

@@ -3,6 +3,7 @@ package lexer
 import (
 	"fmt"
 	"strings"
+	"unicode"
 
 	"github.com/skx/monkey/token"
 )
@@ -604,49 +605,19 @@ func (l *Lexer) peekChar() rune {
 
 // determinate ch is identifier or not
 func isIdentifier(ch rune) bool {
-	return !isDigit(ch) && !isWhitespace(ch) && !isBrace(ch) && !isOperator(ch) && !isComparison(ch) && !isCompound(ch) && !isBrace(ch) && !isParen(ch) && !isBracket(ch) && !isEmpty(ch)
+
+	if unicode.IsLetter(ch) || unicode.IsDigit(ch) || ch == '.' || ch == '?' || ch == '_' {
+		return true
+	}
+
+	return false
 }
 
 // is white space
 func isWhitespace(ch rune) bool {
 	return ch == rune(' ') || ch == rune('\t') || ch == rune('\n') || ch == rune('\r')
 }
 
-// is operators
-func isOperator(ch rune) bool {
-	return ch == rune('+') || ch == rune('%') || ch == rune('-') || ch == rune('/') || ch == rune('*')
-}
-
-// is comparison
-func isComparison(ch rune) bool {
-	return ch == rune('=') || ch == rune('!') || ch == rune('>') || ch == rune('<')
-}
-
-// is compound
-func isCompound(ch rune) bool {
-	return ch == rune(',') || ch == rune(':') || ch == rune('"') || ch == rune(';')
-}
-
-// is brace
-func isBrace(ch rune) bool {
-	return ch == rune('{') || ch == rune('}')
-}
-
-// is bracket
-func isBracket(ch rune) bool {
-	return ch == rune('[') || ch == rune(']')
-}
-
-// is parenthesis
-func isParen(ch rune) bool {
-	return ch == rune('(') || ch == rune(')')
-}
-
-// is empty
-func isEmpty(ch rune) bool {
-	return rune(0) == ch
-}
-
 // is Digit
 func isDigit(ch rune) bool {
 	return rune('0') <= ch && ch <= rune('9')

lexer/lexer_test.go

@@ -359,15 +359,13 @@ let a = "steve\t";
 let a = "steve\r";
 let a = "steve\\";
 let a = "steve\"";
-let c = 3.113£;
-.;
-`
-	input += "`/bin/ls`"
-	input += "/*\n"
+let c = 3.113;
+.;`
 
 	l := New(input)
 	tok := l.NextToken()
 	for tok.Type != token.EOF {
+
 		tok = l.NextToken()
 	}
 }