Worked on #65. Added array parts to the scanner ([, ]). Removed the R…

…ADIX token.
mjstahl · May 30, 2013 · 568b9ca · 568b9ca
1 parent 958af15
commit 568b9ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/soma/scan/scanner.go b/src/soma/scan/scanner.go
@@ -97,6 +97,10 @@ func (s *Scanner) Scan() (pos file.Pos, tok Token, lit string) {
 			tok, lit = LBRACE, "{"
 		case '}':
 			tok, lit = RBRACE, "}"
+		case '[':
+			tok, lit = LBRACK, "["
+		case ']':
+			tok, lit = RBRACK, "]"
 		case '(':
 			tok, lit = LPAREN, "("
 		case ')':

diff --git a/src/soma/scan/token.go b/src/soma/scan/token.go
@@ -9,23 +9,24 @@ type Token int
 
 const (
 	ILLEGAL Token = iota
-	EOF           // EOF
+	EOF     // EOF
 
 	COMMENT // "a comment"
 
-	BINARY  // +, |, &, ^
+	BINARY  // '!', '%', '*', '/', '+', '|', '&', '^', '-', '>', '<', '=', '?', '\', '~':
 	IDENT   // aBool, not
 	KEYWORD // ifTrue:
 	GLOBAL  // True, False nil
 
 	INT
-	RADIX
 
 	ASSIGN // :=
 	DEFINE // =>
 
 	LBRACE // {
 	RBRACE // }
+	LBRACK // [
+	RBRACK // ]
 	LPAREN // (
 	RPAREN // )
 
@@ -58,6 +59,8 @@ var tokens = [...]string{
 
 	LBRACE: "{",
 	RBRACE: "}",
+	LBRACK: "[",
+	RBRACK: "]",
 	LPAREN: "(",
 	RPAREN: ")",