diff options
| author | Jan Tuomi <jans.tuomi@gmail.com> | 2016-06-21 22:44:42 +0300 |
|---|---|---|
| committer | Jan Tuomi <jans.tuomi@gmail.com> | 2016-07-26 19:47:09 +0300 |
| commit | 695f7f3e2613d96a597e15a8c6142019098745c8 (patch) | |
| tree | b89a2e41dab52f260c79d1c7768f0f0bdb1e784d | |
| parent | acf7fa23e7a254fc690f036aab61fe4d9633fc30 (diff) | |
Fix comment token regex
| -rw-r--r-- | main/core/tokenizer/Tokenizer.java | 2 | ||||
| -rw-r--r-- | test/resources/program.bork | 17 |
2 files changed, 4 insertions, 15 deletions
diff --git a/main/core/tokenizer/Tokenizer.java b/main/core/tokenizer/Tokenizer.java index 2580abb..3501737 100644 --- a/main/core/tokenizer/Tokenizer.java +++ b/main/core/tokenizer/Tokenizer.java @@ -33,7 +33,7 @@ public class Tokenizer { } private Tokenizer() { - tokenRegexes.put(Token.Type.CommentToken, "^\\/\\*(.*)\\*\\/"); + tokenRegexes.put(Token.Type.CommentToken, "^\\/\\*(.*?)\\*\\/"); tokenRegexes.put(Token.Type.StringLiteralToken, "^\"(.*?)\""); tokenRegexes.put(Token.Type.WhitespaceToken, "^( |\t)"); tokenRegexes.put(Token.Type.NewlineToken, "^(\n|\r\n)"); diff --git a/test/resources/program.bork b/test/resources/program.bork index 1b7717d..52cee38 100644 --- a/test/resources/program.bork +++ b/test/resources/program.bork @@ -1,26 +1,15 @@ -/* Test program */ - -/* -func sum x y as - + x y -end - -decl x decl y -set x 10 -set y 20 - -sum(x y) -*/ - +/* get an integer from the user */ decl user_input set user_input in("give integer: ") out( concat("your input was: " user_input "!") ) +/* add 10 to the integer */ decl operand set operand 10 decl sum set sum + as_int(user_input) operand +/* print the sum */ out( concat(user_input " + " operand " = " sum) ) "done"
\ No newline at end of file |