6e8415e · elk · git.iko.soy

on master help sign in

Merge pull request #949 from jvoigtlaender/parse-messages

6e8415eEvan Czaplicki11 years ago

src/Parse/Helpers.hs+4−4

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

64var :: IParser String

65var =

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

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

69lowVar :: IParser String

70lowVar =

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

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

74capVar :: IParser String

75capVar =

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

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

79qualifiedVar :: IParser String

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

89innerVarChar :: IParser Char

90innerVarChar =

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

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

94makeVar :: IParser Char -> IParser String

src/Parse/Module.hs+2−2

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

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

80listing item =

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

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

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

83 whitespace

84 listing <-

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

94value :: IParser Var.Value

95value =

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

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

97 where

98 val =

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