6e8415e · elk · git.iko.soy

git.iko.soy/elk

Merge pull request #949 from jvoigtlaender/parse-messages

Improved parse error messages

commit6e8415e3de6414d9e4dc83f0066083018ed09962 authorEvan Czaplicki <info@elm-lang.org> dateMon 1 Jun 2015, 08:44 (11 years ago) parent129ee3c 8dd6098

2 files changed+6−6

compare with master

unifiedsplit

src/Parse/Helpers.hs+4−4 src/Parse/Module.hs+2−2

src/Parse/Helpers.hs+4−4

@@ -63,17 +63,17 @@ iParseWithTable sourceName table aParser input =

6363

6464var :: IParser String

6565var =

66− makeVar (letter <|> char '_') <?> "a variable"

66+ makeVar (letter <|> char '_') <?> "a name"

6767

6868

6969lowVar :: IParser String

7070lowVar =

71− makeVar lower <?> "a lower case variable"

71+ makeVar lower <?> "a lower case name"

7272

7373

7474capVar :: IParser String

7575capVar =

76− makeVar upper <?> "an upper case variable"

76+ makeVar upper <?> "an upper case name"

7777

7878

7979qualifiedVar :: IParser String

@@ -88,7 +88,7 @@ rLabel = lowVar

8888

8989innerVarChar :: IParser Char

9090innerVarChar =

91− alphaNum <|> char '_' <|> char '\'' <?> "more letters in this variable"

91+ alphaNum <|> char '_' <|> char '\'' <?> "more letters in this name"

9292

9393

9494makeVar :: IParser Char -> IParser String

src/Parse/Module.hs+2−2

@@ -78,7 +78,7 @@ import' =

7878

7979listing :: IParser a -> IParser (Var.Listing a)

8080listing item =

81− expecting "a listing of values to expose, like (..)" $

81+ expecting "a listing of values and types to expose, like (..)" $

8282 do try (whitespace >> char '(')

8383 whitespace

8484 listing <-

@@ -93,7 +93,7 @@ listing item =

9393

9494value :: IParser Var.Value

9595value =

96− val <|> tipe <?> "a value to expose"

96+ val <|> tipe <?> "a value or type to expose"

9797 where

9898 val =

9999 Var.Value <$> (lowVar <|> parens symOp)