Merge pull request #70 from d5/fix69

Remove unused tokens
d5 · Jan 31, 2019 · 6420628 · 6420628
2 parents 61e534e + 061d800
commit 6420628
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/compiler/parser/parser.go b/compiler/parser/parser.go
@@ -566,7 +566,7 @@ func (p *Parser) parseStmtList() (list []ast.Stmt) {
 		defer un(trace(p, "StatementList"))
 	}
 
-	for p.token != token.Case && p.token != token.Default && p.token != token.RBrace && p.token != token.EOF {
+	for p.token != token.RBrace && p.token != token.EOF {
 		list = append(list, p.parseStmt())
 	}
 

diff --git a/compiler/parser/sync.go b/compiler/parser/sync.go
@@ -8,6 +8,4 @@ var stmtStart = map[token.Token]bool{
 	token.For:      true,
 	token.If:       true,
 	token.Return:   true,
-	token.Switch:   true,
-	token.Var:      true,
 }
diff --git a/compiler/scanner/scanner_test.go b/compiler/scanner/scanner_test.go
@@ -110,16 +110,12 @@ func TestScanner_Scan(t *testing.T) {
 		{token.Semicolon, ";"},
 		{token.Colon, ":"},
 		{token.Break, "break"},
-		{token.Case, "case"},
 		{token.Continue, "continue"},
-		{token.Default, "default"},
 		{token.Else, "else"},
 		{token.For, "for"},
 		{token.Func, "func"},
 		{token.If, "if"},
 		{token.Return, "return"},
-		{token.Switch, "switch"},
-		{token.Var, "var"},
 	}
 
 	// combine

diff --git a/compiler/token/tokens.go b/compiler/token/tokens.go
@@ -68,18 +68,14 @@ const (
 	_operatorEnd
 	_keywordBeg
 	Break
-	Case
 	Continue
-	Default
 	Else
 	For
 	Func
 	Error
 	Immutable
 	If
 	Return
-	Switch
-	Var
 	True
 	False
 	In
@@ -145,18 +141,14 @@ var tokens = [...]string{
 	Colon:        ":",
 	Question:     "?",
 	Break:        "break",
-	Case:         "case",
 	Continue:     "continue",
-	Default:      "default",
 	Else:         "else",
 	For:          "for",
 	Func:         "func",
 	Error:        "error",
 	Immutable:    "immutable",
 	If:           "if",
 	Return:       "return",
-	Switch:       "switch",
-	Var:          "var",
 	True:         "true",
 	False:        "false",
 	In:           "in",