446c784 · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Switch record update to use `=` sign

446c784Evan Czaplicki11 years ago

src/Parse/Expression.hs+2−2

compare with master

@@ -151,7 +151,7 @@ recordTerm =

151 return (E.Update (A.A ann (E.rawVar starter)) fields)

151 return (E.Update (A.A ann (E.rawVar starter)) fields)

152

152

153 literal (A.A _ starter) =

153 literal (A.A _ starter) =

154− do try (string "<-")

154+ do try equals

155 whitespace

155 whitespace

156 value <- expr

156 value <- expr

157 whitespace

157 whitespace

@@ -165,7 +165,7 @@ recordTerm =

165

165

166 field =

166 field =

167 do key <- rLabel

167 do key <- rLabel

168− padded (string "<-")

168+ padded equals

169 value <- expr

169 value <- expr

170 return (key, value)

170 return (key, value)

171

171

src/Parse/Helpers.hs+1−6

@@ -137,11 +137,6 @@ rightArrow =

137 string "->" <|> string "\8594" <?> "->"

137 string "->" <|> string "\8594" <?> "->"

138

138

139

139

140−leftArrow :: IParser String

141−leftArrow =

142− string "<-" <?> "<- for a record update"

143−

144−

145hasType :: IParser String

140hasType :: IParser String

146hasType =

141hasType =

147 string ":" <?> "the \"has type\" symbol ':'"

142 string ":" <?> "the \"has type\" symbol ':'"

@@ -632,6 +627,6 @@ processAs processor s =

632 , T.opStart = undefined

627 , T.opStart = undefined

633 , T.opLetter = undefined

628 , T.opLetter = undefined

634 , T.reservedNames = reserveds

629 , T.reservedNames = reserveds

635− , T.reservedOpNames = [":", "->", "<-", "|"]

630+ , T.reservedOpNames = [":", "->", "|"]

636 , T.caseSensitive = True

631 , T.caseSensitive = True

637 }

632 }