From: pimjager Date: Mon, 29 Feb 2016 13:04:03 +0000 (+0100) Subject: merged master X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4c779c9791b03d96a76956e314cbc95f056448ce;hp=-c;p=cc1516.git merged master --- 4c779c9791b03d96a76956e314cbc95f056448ce diff --combined src/main.prj index f2d50f9,db2b7d3..f0b6422 --- a/src/main.prj +++ b/src/main.prj @@@ -31,7 -31,6 +31,7 @@@ Globa Link LinkMethod: Static GenerateRelocations: False + GenerateSymbolTable: False GenerateLinkMap: False LinkResources: False ResourceSource: @@@ -420,9 -419,9 +420,37 @@@ OtherModule ReadableABC: False ReuseUniqueNodes: True Fusion: False ++ Module ++ Name: System.OS ++ Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64 ++ Compiler ++ NeverMemoryProfile: False ++ NeverTimeProfile: False ++ StrictnessAnalysis: True ++ ListTypes: StrictExportTypes ++ ListAttributes: True ++ Warnings: True ++ Verbose: True ++ ReadableABC: False ++ ReuseUniqueNodes: True ++ Fusion: False ++ Module ++ Name: System.OS ++ Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64 ++ Compiler ++ NeverMemoryProfile: False ++ NeverTimeProfile: False ++ StrictnessAnalysis: True ++ ListTypes: StrictExportTypes ++ ListAttributes: True ++ Warnings: True ++ Verbose: True ++ ReadableABC: False ++ ReuseUniqueNodes: True ++ Fusion: False Module Name: Control.Applicative - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -436,7 -435,7 +464,7 @@@ Fusion: False Module Name: Control.Monad - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -450,7 -449,7 +478,7 @@@ Fusion: False Module Name: Data.Either - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -464,7 -463,7 +492,7 @@@ Fusion: False Module Name: Data.Foldable - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -478,7 -477,7 +506,7 @@@ Fusion: False Module Name: Data.Func - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -492,7 -491,7 +520,7 @@@ Fusion: False Module Name: Data.Functor - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -506,7 -505,7 +534,7 @@@ Fusion: False Module Name: Data.List - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -520,7 -519,7 +548,7 @@@ Fusion: False Module Name: Data.Map - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -534,7 -533,7 +562,7 @@@ Fusion: False Module Name: Data.Maybe - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -548,7 -547,7 +576,7 @@@ Fusion: False Module Name: Data.Monoid - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -562,7 -561,7 +590,7 @@@ Fusion: False Module Name: Data.Set - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -576,7 -575,7 +604,7 @@@ Fusion: False Module Name: Data.Traversable - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -590,7 -589,7 +618,7 @@@ Fusion: False Module Name: Data.Void - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -604,7 -603,7 +632,7 @@@ Fusion: False Module Name: System.CommandLine - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -618,7 -617,7 +646,7 @@@ Fusion: False Module Name: System.IO - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -632,7 -631,7 +660,7 @@@ Fusion: False Module Name: System._Pointer - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -646,7 -645,7 +674,7 @@@ Fusion: False Module Name: Text - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -660,7 -659,7 +688,7 @@@ Fusion: False Module Name: Text.JSON - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -674,7 -673,7 +702,7 @@@ Fusion: False Module Name: Text.PPrint - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -687,8 -686,8 +715,8 @@@ ReuseUniqueNodes: True Fusion: False Module - Name: System.OS - Dir: {Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64 + Name: StdMaybe + Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib Compiler NeverMemoryProfile: False NeverTimeProfile: False @@@ -700,20 -699,6 +728,6 @@@ ReadableABC: False ReuseUniqueNodes: True Fusion: False - Module - Name: System.OS - Dir: {Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Mac - Compiler - NeverMemoryProfile: False - NeverTimeProfile: False - StrictnessAnalysis: True - ListTypes: StrictExportTypes - ListAttributes: True - Warnings: True - Verbose: True - ReadableABC: False - ReuseUniqueNodes: True - Fusion: False Module Name: _SystemDynamic Dir: {Application}/lib/iTasks-SDK/Patches/Dynamics @@@ -770,3 -755,17 +784,3 @@@ ReadableABC: False ReuseUniqueNodes: True Fusion: False - Module - Name: StdMaybe - Dir: {Application}/lib/iTasks-SDK/Server/lib - Compiler - NeverMemoryProfile: False - NeverTimeProfile: False - StrictnessAnalysis: True - ListTypes: StrictExportTypes - ListAttributes: True - Warnings: True - Verbose: True - ReadableABC: False - ReuseUniqueNodes: True - Fusion: False diff --combined src/parse.icl index f57c5e5,c28fb4c..9f43314 --- a/src/parse.icl +++ b/src/parse.icl @@@ -68,15 -68,6 +68,6 @@@ parseStmt = parseIfStmt <|> parseWhileS //first pure makes singleton list from the statement parseOneLine = liftM pure parseStmt - parseBBraces :: (Parser Token a) -> Parser Token a - parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken - - parseBCBraces :: (Parser Token a) -> Parser Token a - parseBCBraces p = satTok CBraceOpenToken *> p <* satTok CBraceCloseToken - - parseBSqBraces :: (Parser Token a) -> Parser Token a - parseBSqBraces p = satTok SquareOpenToken *> p <* satTok SquareCloseToken - parseFunType :: Parser Token FunType parseFunType = satTok DoubleColonToken *> (parseInOutType <|> (liftM (FunType []) parseVoidOrType)) @@@ -101,12 -92,9 +92,9 @@@ parseType trans1 CharTypeToken CharType <|> trans1 BoolTypeToken BoolType <|> (liftM ListType (parseBSqBraces parseType)) <|> - (liftM2 TupleType - (satTok BraceOpenToken *> parseType <* satTok CommaToken) - (parseType <* satTok BraceCloseToken)) <|> + (liftM TupleType (parseTuple parseType)) <|> (liftM IdType parseIdent) - //TODO hieronder omzetten naar liftm notatie parseExpr :: Parser Token Expr parseExpr = //Operators in order of binding strength parseOpR (trans1 ColonToken BiCons) $ @@@ -136,37 -124,48 +124,48 @@@ parseBasicExpr :: Parser Token Expr parseBasicExpr = - (satTok BraceOpenToken *> parseExpr <* satTok CommaToken - >>= \e1->parseExpr <* satTok BraceCloseToken - >>= \e2->pure $ TupleExpr e1 e2) <|> - (parseFunCall >>= \fc->pure $ FunExpr fc) <|> + (liftM TupleExpr (parseTuple parseExpr)) <|> + (liftM FunExpr parseFunCall) <|> parseBBraces parseExpr <|> trans1 EmptyListToken EmptyListExpr <|> - trans2 TrueToken (const $ BoolExpr True) <|> - trans2 FalseToken (const $ BoolExpr False) <|> + trans1 TrueToken (BoolExpr True) <|> + trans1 FalseToken (BoolExpr False) <|> trans2 (NumberToken zero) (\(NumberToken i)->IntExpr i) <|> trans2 (CharToken zero) (\(CharToken c)->CharExpr c) <|> - (parseOp1 >>= \o->parseExpr >>= \e.pure $ Op1Expr o e) <|> - (parseVarDef >>= \ve->pure $ VarExpr ve) + (liftM2 Op1Expr parseOp1 parseExpr) <|> + (liftM VarExpr parseVarDef) parseFunCall :: Parser Token FunCall - parseFunCall = parseIdent <* satTok BraceOpenToken - >>= \i->parseSepList CommaToken parseExpr - <* satTok BraceCloseToken >>= \es->pure $ FunCall i es + parseFunCall = liftM2 FunCall + parseIdent (parseBBraces $ parseSepList CommaToken parseExpr) parseVarDef :: Parser Token VarDef - parseVarDef = parseIdent - >>= \i-> many (satTok DotToken *> ( + parseVarDef = liftM2 VarDef + parseIdent + (many (satTok DotToken *> ( (parseIdent >>= (\i.if (i == "hd") (pure FieldHd) empty)) <|> (parseIdent >>= \i.if (i == "tl") (pure FieldTl) empty) <|> (parseIdent >>= \i.if (i == "fst") (pure FieldFst) empty) <|> - (parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty)) - ) >>= \f->pure $ VarDef i f + (parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty)))) parseOp1 :: Parser Token Op1 parseOp1 = trans1 DashToken UnMinus <|> trans1 ExclamationToken UnNegation + parseBBraces :: (Parser Token a) -> Parser Token a + parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken + + parseBCBraces :: (Parser Token a) -> Parser Token a + parseBCBraces p = satTok CBraceOpenToken *> p <* satTok CBraceCloseToken + + parseBSqBraces :: (Parser Token a) -> Parser Token a + parseBSqBraces p = satTok SquareOpenToken *> p <* satTok SquareCloseToken + + parseTuple :: (Parser Token a) -> Parser Token (a, a) + parseTuple p = satTok BraceOpenToken *> + (liftM2 (\a->(\b->(a,b))) (p <* satTok CommaToken) p) + <* satTok BraceCloseToken + trans2 :: TokenValue (TokenValue -> a) -> Parser Token a trans2 t f = satTok t >>= \(_, r).pure (f r) @@@ -176,7 -175,7 +175,7 @@@ trans1 t r = trans2 t $ const derive gPrint TokenValue derive gEq TokenValue satTok :: TokenValue -> Parser Token Token -satTok t = top >>= \tok=:(pos, tv) -> if (eq t tok) (return tok) (fail (printToString t, pos)) +satTok t = top >>= \tok=:(pos, tv) -> if (eq t tok) (return tok) (fail (printToString tv, pos)) where eq (IdentToken _) (_, IdentToken _) = True eq (NumberToken _) (_, NumberToken _) = True @@@ -185,8 -184,8 +184,8 @@@ parseSepList :: TokenValue (Parser Token a) -> Parser Token [a] parseSepList sep p = - (some (p <* satTok sep) >>= \es->p >>= \e.pure $ reverse [e:es]) <|> - (p >>= \e->pure [e]) <|> pure [] + (liftM2 (\es->(\e->reverse [e:es])) (some (p <* satTok sep)) p) <|> + (liftM pure p) <|> pure empty parseIdent :: Parser Token String parseIdent = trans2 (IdentToken []) (\(IdentToken e).toString e) @@@ -205,8 -204,8 +204,8 @@@ instance print FunDecl wher print (FunDecl i as t vs ss) = ["\n", i, " (":printersperse "," as] ++ [") :: ":print t] ++ - ["{":printersperse "\n\t" vs] ++ - ["\n":printStatements ss 1] ++ ["}"] + ["{\n\t":printersperse "\n\t" vs] ++ + ["\n":printStatements ss 1] ++ ["}\n"] printStatements :: [Stmt] Int -> [String] printStatements [] i = [] @@@ -239,7 -238,7 +238,7 @@@ instance print VarDecl wher print (VarDecl t i e) = print t ++ [" ":i:"=":print e] ++ [";"] instance print Type where - print (TupleType t1 t2) = ["(":print t1] ++ [",":print t2] ++ [")"] + print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"] print (ListType t) = ["[":print t] ++ ["]"] print (IdType s) = print s print IntType = print "Int" @@@ -282,4 -281,4 +281,4 @@@ instance print Expr wher print (BoolExpr b) = [toString b] print (FunExpr fc) = print fc print EmptyListExpr = ["[]"] - print (TupleExpr e1 e2) = ["(":print e1] ++ [",":print e2] ++ [")"] + print (TupleExpr (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]