radumaco/RosettaHaskellCompiler
1
0
Fork 0
mirror of https://github.com/macocianradu/RosettaHaskellCompiler.git synced 2026-03-18 21:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
Radu Macocian
2022-07-27 17:51:08 +03:00
parent 3d14257870
commit 18b7e778a2
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PrettyPrinter/Enum.hs
View File

@@ -41,5 +41,3 @@ printDisplayName enumName (MakeEnumValue name _ (Just display)) =
"show" <+> pretty enumName <> pretty name <+> "= \"" <> pretty display <> "\"" "show" <+> pretty enumName <> pretty name <+> "= \"" <> pretty display <> "\""
printDisplayName enumName (MakeEnumValue name _ Nothing) = printDisplayName enumName (MakeEnumValue name _ Nothing) =
"show" <+> pretty enumName <> pretty name <+> "= \"" <> pretty name <> "\"" "show" <+> pretty enumName <> pretty name <+> "= \"" <> pretty name <> "\""

2
src/Semantic/ExpressionChecker.hs
View File

@@ -266,7 +266,7 @@ checkFunctionCall [] fun args = Left $ UndefinedFunction $ "Undefined function:
checkFunctionCall ((Func n a r):symbolMap) name args checkFunctionCall ((Func n a r):symbolMap) name args
| not $ null $ lefts args = Left $ ErrorInsideFunction (name ++ ": " ++ show (lefts args)) | not $ null $ lefts args = Left $ ErrorInsideFunction (name ++ ": " ++ show (lefts args))
| name == n = if all isRight coerce then Right $ ExplicitFunction name (zip (rights args) (rights coerce)) (MakeCoercion [MakeIdCoercion (fst r)] (MakeCardinalityIdCoercion (snd r))) | name == n = if all isRight coerce then Right $ ExplicitFunction name (zip (rights args) (rights coerce)) (MakeCoercion [MakeIdCoercion (fst r)] (MakeCardinalityIdCoercion (snd r)))
else checkFunctionCall symbolMap name args--Left $ UndefinedFunction $ "Undefined function: " ++ name ++ " [" ++ show (rights args) ++ "]" else checkFunctionCall symbolMap name args
| otherwise = checkFunctionCall symbolMap name args | otherwise = checkFunctionCall symbolMap name args
where where
argCoerce = map returnCoercion (rights args) argCoerce = map returnCoercion (rights args)

14
test/Parser/ExpressionSpec.hs
View File

@@ -42,23 +42,23 @@ spec = do
exps :: [Expression] exps :: [Expression]
exps = [ exps = [
-- 1 -- 1
InfixExp "+" (Int "1") (Parens (InfixExp "-" (Int "2") (Int "3"))), InfixExp "+" (Int "1") (Parens (InfixExp "- " (Int "2") (Int "3"))),
-- 2 -- 2
InfixExp "=" InfixExp "="
(InfixExp "-" (InfixExp "- "
(InfixExp "-" (InfixExp "- "
(InfixExp "*" (Variable "a") (Variable "b")) (InfixExp "*" (Variable "a") (Variable "b"))
(InfixExp "*" (Variable "c") (Variable "d"))) (InfixExp "*" (Variable "c") (Variable "d")))
(InfixExp "*" (Variable "e") (Variable "f"))) (InfixExp "*" (Variable "e") (Variable "f")))
(InfixExp "-" (InfixExp "- "
(InfixExp "-" (InfixExp "- "
(InfixExp "*" (Variable "g") (Variable "h")) (InfixExp "*" (Variable "g") (Variable "h"))
(InfixExp "*" (Variable "i") (Variable "j"))) (InfixExp "*" (Variable "i") (Variable "j")))
(InfixExp "*" (Variable "k") (Variable "l"))), (InfixExp "*" (Variable "k") (Variable "l"))),
-- 3 -- 3
InfixExp "-" (InfixExp "+" (Variable "a") (Variable "b")) (InfixExp "*" (Variable "c") (InfixExp "^" (Variable "d") (Variable "e"))), InfixExp "-" (InfixExp "+" (Variable "a") (Variable "b")) (InfixExp "*" (Variable "c") (InfixExp "^" (Variable "d") (Variable "e"))),
-- 4 -- 4
InfixExp "-" (InfixExp "-" (InfixExp "-" (InfixExp "-" (InfixExp "-" (Int "1") (Int "2")) (Int "3")) (Int "4")) (Int "5")) (Int "6"), InfixExp "-" (InfixExp "- " (InfixExp "- " (InfixExp "- " (InfixExp "- " (Int "1") (Int "2")) (Int "3")) (Int "4")) (Int "5")) (Int "6"),
-- 5 -- 5
List [Int "1", Int "2", Int "3"], List [Int "1", Int "2", Int "3"],
-- 6 -- 6
@@ -74,7 +74,7 @@ exps = [
(InfixExp "-" (InfixExp "+" (Variable "a") (Variable "b")) (InfixExp "*" (Variable "c") (InfixExp "^" (Variable "d") (PathExpression (Variable "e") (Variable "x"))))) (InfixExp "-" (InfixExp "+" (Variable "a") (Variable "b")) (InfixExp "*" (Variable "c") (InfixExp "^" (Variable "d") (PathExpression (Variable "e") (Variable "x")))))
(PrefixExp "not" (PostfixExp "exists" (Variable "a"))), (PrefixExp "not" (PostfixExp "exists" (Variable "a"))),
-- 11 -- 11
IfSimple (List [Int "1", Function "Function" [Int "3"]]) (InfixExp "-" (InfixExp "-" (Int "1") (Int "2")) (InfixExp "*" (Int "3") (InfixExp "^" (PathExpression (Variable "a") (Variable "b")) (Variable "c")))), IfSimple (List [Int "1", Function "Function" [Int "3"]]) (InfixExp "- " (InfixExp "- " (Int "1") (Int "2")) (InfixExp "*" (Int "3") (InfixExp "^" (PathExpression (Variable "a") (Variable "b")) (Variable "c")))),
-- 12 -- 12
InfixExp "or" (Variable "a") (Variable "b") InfixExp "or" (Variable "a") (Variable "b")
] ]