git.iko.soy/elk
on master help sign in
Remove special case support for appending text
128138cEvan Czaplicki
src/AST/Variable.hs−10
compare with master
unifiedsplit
@@ -124,16 +124,6 @@ isTask =
124 is ["Task"] "Task"
124 is ["Task"] "Task"
125
125
126
126
127−isSignal :: Canonical -> Bool
128−isSignal =
129− is ["Signal"] "Signal"
130−
131−
132−isText :: Canonical -> Bool
133−isText =
134− is ["Text"] "Text"
135−
136−
137isList :: Canonical -> Bool
127isList :: Canonical -> Bool
138isList v =
128isList v =
139 v == Canonical BuiltIn "List"
129 v == Canonical BuiltIn "List"
src/Type/Unify.hs+1−1
@@ -353,7 +353,7 @@ atomMatchesSuper super name =
353 isPrimitiveFrom ["Int", "Float", "Char", "String"] name
353 isPrimitiveFrom ["Int", "Float", "Char", "String"] name
354
354
355 Appendable ->
355 Appendable ->
356− Var.isPrim "String" name || Var.isText name
356+ Var.isPrim "String" name
357
357
358 CompAppend ->
358 CompAppend ->
359 Var.isPrim "String" name
359 Var.isPrim "String" name