Merge pull request #86 from matoruru/master

Fix the token definition for Java style

Author: thomashoneyman

src/Text/Parsing/Parser/Language.purs

@@ -49,8 +49,8 @@ javaStyle   = LanguageDef (unGenLanguageDef emptyDef)
                 , commentEnd      = "*/"
                 , commentLine     = "//"
                 , nestedComments  = true
-                , identStart      = letter
-                , identLetter     = alphaNum <|> oneOf ['_', '\'']
+                , identStart      = letter <|> oneOf ['_', '$']
+                , identLetter     = alphaNum <|> oneOf ['_', '$']
                 , reservedNames   = []
                 , reservedOpNames = []
                 , caseSensitive   = false

test/Main.purs

@@ -406,6 +406,9 @@ javaStyleTest = do
     -- make sure java-style comments work
     parseTest "hello /* comment\n */ fo_" "fo_" $ javaTokParser.identifier *> javaTokParser.identifier
 
+    -- make sure java-style identifier work
+    parseTest "$hello /* comment\n */ _f$o_" "_f$o_" $ javaTokParser.identifier *> javaTokParser.identifier
+
     -- make sure haskell-style comments do not work
     parseErrorTestPosition
         (javaTokParser.identifier *> javaTokParser.identifier)