zeolite-lang 0.1.0.0 → 0.1.1.0

raw patch · 9 files changed

+19/−11 lines, 9 files

Files

• ChangeLog.md +7/−0
• bin/unit-tests.hs +1/−1
• example/hello/README.md +1/−1
• example/regex/README.md +1/−1
• example/tree/README.md +1/−1
• src/Cli/Compiler.hs +5/−3
• src/Cli/ParseCompileOptions.hs +0/−2
• tests/multiple-defs/README.md +2/−1
• zeolite-lang.cabal +1/−1

@@ -1,5 +1,12 @@ # Revision history for zeolite +## 0.1.1.0  -- 2020-04-27++* **[behavior]** Set the default output path for binaries to the module's path+  rather than the current directory.++* **[new]** Allows a base path (`-p`) with recompile mode (`-r`).+ ## 0.1.0.0  -- 2020-04-27  * First version. Released on an unsuspecting world.

@@ -30,7 +30,7 @@   main = runAllTests $ concat [-    labelWith "DefinedCategoryTest"      DefinedCategoryTest.tests,+    labelWith "DefinedCategoryTest" DefinedCategoryTest.tests,     labelWith "TypeInstanceTest"    TypeInstanceTest.tests,     labelWith "ParserTest"          ParserTest.tests,     labelWith "TypeCategoryTest"    TypeCategoryTest.tests,

@@ -10,5 +10,5 @@ zeolite -i lib/util -p "$ZEOLITE_PATH" -m HelloDemo example/hello  # Execute the compiled binary.-./HelloDemo+$ZEOLITE_PATH/HelloDemo ```

@@ -16,5 +16,5 @@ zeolite -p "$ZEOLITE_PATH" -t example/regex  # Execute the compiled binary.-./RegexDemo+$ZEOLITE_PATH/RegexDemo ```

@@ -16,5 +16,5 @@ zeolite -p "$ZEOLITE_PATH" -t example/tree  # Execute the compiled binary.-./TreeDemo+$ZEOLITE_PATH/TreeDemo ```

@@ -347,8 +347,11 @@       cs <- fmap concat $ collectAllOrErrorM $ map parsePublicSource fs       includeNewTypes tm cs     mergeInternal ds = (concat $ map fst ds,concat $ map snd ds)-    getBinaryName (CompileBinary n _) = canonicalizePath $ if null o then n else o-    getBinaryName _                   = return ""+    getBinaryName (CompileBinary n _)+      | null o              = canonicalizePath $ p </> head ds </> n+      | o == takeFileName o = canonicalizePath $ p </> head ds </> o+      | otherwise           = canonicalizePath o+    getBinaryName _ = return ""     createBinary b r deps ma@(CompileBinary n _) ms       | length ms > 1 = do         hPutStrLn stderr $ "Multiple matches for main category " ++ n ++ "."@@ -358,7 +361,6 @@         exitFailure       | otherwise = do           f0 <- getBinaryName ma-          let f0 = if null o then n else o           let (CxxOutput _ _ _ ns2 req content) = head ms           -- TODO: Create a helper or a constant or something.           (o',h) <- mkstemps "/tmp/zmain_" ".cpp"

@@ -207,8 +207,6 @@   | (not $ null $ es ++ ep) && (isCreateTemplates m) =     compileError "Extra files (-e) are not allowed in template mode (--templates)." -  | (not $ null p) && (isCompileRecompile m) =-    compileError "Path prefix (-p) is not allowed in recompile mode (-r)."   | (not $ null o) && (isCompileRecompile m) =     compileError "Output filename (-o) is not allowed in recompile mode (-r)."   | (not $ null $ is ++ is2) && (isCompileRecompile m) =

@@ -7,7 +7,8 @@ To compile:  ```shell-../../zeolite -r .+ZEOLITE_PATH=$(zeolite --get-path)+zeolite -r $ZEOLITE_PATH/tests/multiple-defs ```  The compiler error should look something like this:

@@ -1,5 +1,5 @@ name:                zeolite-lang-version:             0.1.0.0+version:             0.1.1.0 synopsis:            Zeolite is a statically-typed, general-purpose programming language.  description: