git.iko.soy/elk
on master help sign in
Get Parse.Kernel compiling again

Stop supporting object fields that are quoted or numbers. Just use normal names.

commit14adb8ef625be750a76d0652a373583e9003cb30 authorEvan Czaplicki <evancz@users.noreply.github.com> dateWed 25 Oct 2017, 19:34 (9 years ago) parent5fab52a
3 files changed+12−48
compare with master
unifiedsplit
src/Generate/JavaScript/Builder.hs+6−34 src/Generate/JavaScript/Helpers.hs+2−2 src/Generate/JavaScript/Variable.hs+4−12
src/Generate/JavaScript/Builder.hs+6−34
@@ -3,7 +3,7 @@
33module Generate.JavaScript.Builder
44 ( stmtToBuilder
55 , exprToBuilder
6− , Expr(..), Id(..), Prop(..), LValue(..)
6+ , Expr(..), Id(..), LValue(..)
77 , Stmt(..), Case(..), VarDecl(..)
88 , InfixOp(..), PrefixOp(..)
99 )
@@ -33,7 +33,7 @@ data Expr
3333 | Bool Bool
3434 | Null
3535 | Array [Expr]
36− | Object [(Prop, Expr)]
36+ | Object [(Id, Expr)]
3737 | VarRef Id
3838 | DotRef Expr Id -- ^ @foo.bar@, spec 11.2.1
3939 | BracketRef Expr Expr -- ^ @foo[bar]@, spec 11.2.1
@@ -48,12 +48,6 @@ data Expr
4848newtype Id = Id Text
4949
5050
51−data Prop
52− = StringProp Text
53− | IntProp Int
54− | IdProp Id
55−
56−
5751data LValue
5852 = LVar Text
5953 | LDot Expr Text
@@ -335,7 +329,7 @@ fromExpr :: Builder -> Grouping -> Expr -> (Lines, Builder)
335329fromExpr indent grouping expression =
336330 case expression of
337331 String string ->
338− (One, quoted string)
332+ (One, "'" <> Text.encodeUtf8Builder string <> "'")
339333
340334 Float n ->
341335 (One, doubleDec n)
@@ -465,39 +459,17 @@ fromExpr indent grouping expression =
465459-- FIELDS
466460
467461
468−fromField :: Builder -> (Prop, Expr) -> (Lines, Builder)
469−fromField indent (prop, expr) =
462+fromField :: Builder -> (Id, Expr) -> (Lines, Builder)
463+fromField indent (field, expr) =
470464 let
471465 (lines, builder) =
472466 fromExpr indent Whatever expr
473467 in
474468 ( lines
475− , fromProp prop <> ": " <> builder
469+ , fromId field <> ": " <> builder
476470 )
477471
478472
479−fromProp :: Prop -> Builder
480−fromProp prop =
481− case prop of
482− IdProp name ->
483− fromId name
484−
485− StringProp string ->
486− quoted string
487−
488− IntProp n ->
489− intDec n
490−
491−
492−
493−-- STRINGS
494−
495−
496−quoted :: Text -> Builder
497−quoted str =
498− "'" <> Text.encodeUtf8Builder str <> "'"
499−
500−
501473
502474-- VALUES
503475
src/Generate/JavaScript/Helpers.hs+2−2
@@ -42,9 +42,9 @@ ref name =
4242 VarRef (Id name)
4343
4444
45−(==>) :: Text -> Expr -> (Prop, Expr)
45+(==>) :: Text -> Expr -> (Id, Expr)
4646(==>) name expr =
47− ( IdProp (Id name), expr )
47+ ( Id name, expr )
4848
4949
5050obj :: [Text] -> Expr
src/Generate/JavaScript/Variable.hs+4−12
@@ -24,7 +24,6 @@ import qualified Data.Text as Text
2424import qualified Data.Text.Encoding as Text (encodeUtf8)
2525import Data.Word (Word8)
2626
27−import qualified AST.Helpers as Help
2827import qualified AST.Module.Name as ModuleName
2928import qualified AST.Variable as Var
3029import qualified Elm.Package as Pkg
@@ -125,17 +124,10 @@ globalToName (ModuleName.Canonical (Pkg.Name user project) moduleName) name =
125124 "_" <> ModuleName.getKernel moduleName <> "_" <> name
126125
127126 else
128− let
129− revisedName =
130− if Help.isOp name then
131− "_op_" <> Help.desymbol name
132− else
133− name
134− in
135− Text.replace "-" "_" user
136− <> "$" <> Text.replace "-" "_" project
137− <> "$" <> Text.replace "." "_" moduleName
138− <> "$" <> revisedName
127+ Text.replace "-" "_" user
128+ <> "$" <> Text.replace "-" "_" project
129+ <> "$" <> Text.replace "." "_" moduleName
130+ <> "$" <> name
139131
140132
141133