diff --git a/Justfile b/Justfile --- a/Justfile +++ b/Justfile @@ -4,10 +4,11 @@ next: @export VERSION=$(ac ats-format.cabal | grep -P -o '\d+\.\d+\.\d+\.\d+' ats-format.cabal | head -n1 | awk -F. '{$NF+=1; print $0}' | sed 's/ /\./g') && echo $VERSION && sed -i "2s/[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/$VERSION/" ats-format.cabal - git commit -am "next" sn c . release: + sn c . + git commit -am "release" git tag "$(grep -P -o '\d+\.\d+\.\d+\.\d+' ats-format.cabal | head -n1)" git push origin --tags git tag -d "$(grep -P -o '\d+\.\d+\.\d+\.\d+' ats-format.cabal | head -n1)" diff --git a/ats-format.cabal b/ats-format.cabal --- a/ats-format.cabal +++ b/ats-format.cabal @@ -1,5 +1,5 @@ name: ats-format -version: 0.1.2.0 +version: 0.1.3.0 synopsis: A source-code formatter for ATS description: An opinionated source-code formatter for [ATS](http://www.ats-lang.org/). homepage: https://hub.darcs.net/vmchale/ats-format#readme diff --git a/src/Language/ATS/PrettyPrint.hs b/src/Language/ATS/PrettyPrint.hs --- a/src/Language/ATS/PrettyPrint.hs +++ b/src/Language/ATS/PrettyPrint.hs @@ -32,6 +32,8 @@ import Text.PrettyPrint.ANSI.Leijen import Text.PrettyPrint.ANSI.Leijen.Internal +infixr 5 $$ + deriving instance Generic Underlining deriving instance NFData Underlining deriving instance Generic ConsoleIntensity @@ -124,12 +126,19 @@ f ('(':_) = True f _ = False +prettySmall :: Doc -> [Doc] -> Doc +prettySmall op es = mconcat (punctuate (" " <> op <> " ") es) + prettyBinary :: Doc -> [Doc] -> Doc -prettyBinary _ [] = mempty -prettyBinary _ [e] = e -prettyBinary op [e, e'] = e <+> op <+> e' -prettyBinary _ _ = undefined +prettyBinary op es + | length (show $ mconcat es) < 80 = prettySmall op es + | otherwise = prettyLarge op es +prettyLarge :: Doc -> [Doc] -> Doc +prettyLarge _ [] = mempty +prettyLarge op (e:es) = e <$> vsep (fmap (op <+>) es) + +-- FIXME we really need a monadic pretty printer lol. lengthAlt :: Doc -> Doc -> Doc lengthAlt d1 d2 | length (show d2) >= 40 = d1 <$> indent 4 d2 @@ -357,21 +366,23 @@ lineAlt = group .* flatAlt prettyRecord :: (Pretty a) => [(String, a)] -> Doc -prettyRecord es = lineAlt (prettyRecordF True es) (prettyRecordS True es) +prettyRecord es + | any ((>40) . length . show . pretty) es = prettyRecordF True es + | otherwise = lineAlt (prettyRecordF True es) (prettyRecordS True es) prettyRecordS :: (Pretty a) => Bool -> [(String, a)] -> Doc prettyRecordS _ [] = mempty prettyRecordS True [(s, t)] = "@{" <+> text s <+> "=" <+> pretty t <+> "}" prettyRecordS _ [(s, t)] = "@{" <+> text s <+> "=" <+> pretty t -prettyRecordS True ((s, t):xs) = prettyRecordS False xs <> ("," <+> text s <+> "=" <+> pretty t <+> "}") -prettyRecordS x ((s, t):xs) = prettyRecordS x xs <> ("," <+> text s <+> "=" <+> pretty t) +prettyRecordS True ((s, t):xs) = prettyRecordS False xs <> "," <+> text s <+> ("=" <+> pretty t) <+> "}" +prettyRecordS x ((s, t):xs) = prettyRecordS x xs <> "," <+> text s <+> ("=" <+> pretty t) prettyRecordF :: (Pretty a) => Bool -> [(String, a)] -> Doc prettyRecordF _ [] = mempty -prettyRecordF True [(s, t)] = "@{" <+> text s <+> "=" <+> pretty t <+> "}" -prettyRecordF _ [(s, t)] = "@{" <+> text s <+> "=" <+> pretty t -prettyRecordF True ((s, t):xs) = prettyRecordF False xs $$ indent 1 ("," <+> text s <+> "=" <+> pretty t <$> "}") -prettyRecordF x ((s, t):xs) = prettyRecordF x xs $$ indent 1 ("," <+> text s <+> "=" <+> pretty t) +prettyRecordF True [(s, t)] = "@{" <+> text s <+> align ("=" <+> pretty t) <+> "}" +prettyRecordF _ [(s, t)] = "@{" <+> text s <+> align ("=" <+> pretty t) +prettyRecordF True ((s, t):xs) = prettyRecordF False xs $$ indent 1 ("," <+> text s <+> align ("=" <+> pretty t) <$> "}") +prettyRecordF x ((s, t):xs) = prettyRecordF x xs $$ indent 1 ("," <+> text s <+> align ("=" <+> pretty t)) prettyDL :: [DataPropLeaf] -> Doc prettyDL [] = mempty diff --git a/src/Language/ATS/Types.hs b/src/Language/ATS/Types.hs --- a/src/Language/ATS/Types.hs +++ b/src/Language/ATS/Types.hs @@ -339,6 +339,8 @@ a (PrecedeF e e'@PrecedeList{}) = PrecedeList (e : _exprs e') a (PrecedeF e e') = PrecedeList [e, e'] a (BinaryF Mult (Binary Add e e') e'') = Binary Add e (Binary Mult e' e'') + a (BinaryF Add e (BinList Add es)) = BinList Add (e : es) + a (BinaryF Add e e') = BinList Add [e, e'] a (ParenExprF _ e@Precede{}) = e a (ParenExprF _ e@PrecedeList{}) = e a x = embed x diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -8,6 +8,7 @@ - composition-prelude-1.1.0.0 - dirstream-1.0.3 - hspec-dirstream-0.3.0.0 + - cli-setup-0.1.0.2 flags: ats-format: development: false diff --git a/test/data/number-theory.out b/test/data/number-theory.out --- a/test/data/number-theory.out +++ b/test/data/number-theory.out @@ -70,8 +70,9 @@ dataprop FACT(int, int) = | FACTbas(0, 1) - | { r, r1 : int }{n : nat} FACTind(n + 1, r) of (FACT(n, r1), MUL(n - + 1, r1, r)) + | { r, r1 : int }{n : nat} FACTind(n + 1, r) of (FACT( n + , r1 + ), MUL(n + 1, r1, r)) fun get_multiplicity { p : nat | p > 1 } (n : intGte(0), p : int(p)) : int = diff --git a/test/data/polyglot.out b/test/data/polyglot.out --- a/test/data/polyglot.out +++ b/test/data/polyglot.out @@ -56,9 +56,11 @@ // monoidal addition for 'file' type fun add_results(x : file, y : file) : file = let - var next = @{ lines = x.lines + y.lines, blanks = x.blanks - + y.blanks, comments = x.comments + y.comments, files = x.files - + y.files } + var next = @{ lines = x.lines + y.lines + , blanks = x.blanks + y.blanks + , comments = x.comments + y.comments + , files = x.files + y.files + } in next end @@ -84,8 +86,7 @@ n end end - | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " - + s) + | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " + s) ; to_file(s, None) ) end @@ -119,10 +120,14 @@ var code = f.lines - f.comments - f.blanks in if f.files > 0 then - " " + right_pad(s, 21) + left_pad(tostring_int(f.files), 5) - + left_pad(tostring_int(f.lines), 12) + left_pad(tostring_int(code), 13) + " " + + right_pad(s, 21) + + left_pad(tostring_int(f.files), 5) + + left_pad(tostring_int(f.lines), 12) + + left_pad(tostring_int(code), 13) + left_pad(tostring_int(f.comments), 13) - + left_pad(tostring_int(f.blanks), 13) + "\n" + + left_pad(tostring_int(f.blanks), 13) + + "\n" else "" end @@ -137,99 +142,327 @@ // helper function to make totals for tabular output. fun sum_fields(sc : source_contents) : file = let - var f = @{ lines = sc.rust.lines + sc.haskell.lines + sc.ats.lines - + sc.python.lines + sc.vimscript.lines + sc.elm.lines + sc.idris.lines - + sc.madlang.lines + sc.tex.lines + sc.markdown.lines + sc.yaml.lines - + sc.toml.lines + sc.cabal.lines + sc.happy.lines + sc.alex.lines - + sc.go.lines + sc.html.lines + sc.css.lines + sc.verilog.lines - + sc.vhdl.lines + sc.c.lines + sc.purescript.lines + sc.futhark.lines - + sc.brainfuck.lines + sc.ruby.lines + sc.julia.lines + sc.perl.lines - + sc.ocaml.lines + sc.agda.lines + sc.cobol.lines + sc.tcl.lines - + sc.r.lines + sc.lua.lines + sc.cpp.lines + sc.lalrpop.lines - + sc.header.lines + sc.sixten.lines + sc.dhall.lines + sc.ipkg.lines - + sc.makefile.lines + sc.justfile.lines + sc.ion.lines + sc.bash.lines - + sc.hamlet.lines + sc.cassius.lines + sc.lucius.lines + sc.julius.lines - + sc.mercury.lines + sc.yacc.lines + sc.lex.lines + sc.coq.lines - + sc.jupyter.lines + sc.java.lines + sc.scala.lines + sc.erlang.lines - + sc.elixir.lines + sc.pony.lines + sc.clojure.lines - + sc.cabal_project.lines + sc.assembly.lines + sc.nix.lines - + sc.php.lines + sc.javascript.lines + sc.kotlin.lines + sc.fsharp.lines - + sc.fortran.lines + sc.swift.lines + sc.csharp.lines + sc.nim.lines - + sc.cpp_header.lines + sc.elisp.lines + sc.plaintext.lines - + sc.rakefile.lines + sc.llvm.lines + sc.autoconf.lines + sc.batch.lines - + sc.powershell.lines + sc.m4.lines + sc.objective_c.lines - + sc.automake.lines, blanks = sc.rust.blanks + sc.haskell.blanks - + sc.ats.blanks + sc.python.blanks + sc.vimscript.blanks + sc.elm.blanks - + sc.idris.blanks + sc.madlang.blanks + sc.tex.blanks - + sc.markdown.blanks + sc.yaml.blanks + sc.toml.blanks + sc.cabal.blanks - + sc.happy.blanks + sc.alex.blanks + sc.go.blanks + sc.html.blanks - + sc.css.blanks + sc.verilog.blanks + sc.vhdl.blanks + sc.c.blanks - + sc.purescript.blanks + sc.futhark.blanks + sc.brainfuck.blanks - + sc.ruby.blanks + sc.julia.blanks + sc.perl.blanks + sc.ocaml.blanks - + sc.agda.blanks + sc.cobol.blanks + sc.tcl.blanks + sc.r.blanks - + sc.lua.blanks + sc.cpp.blanks + sc.lalrpop.blanks + sc.header.blanks - + sc.sixten.blanks + sc.dhall.blanks + sc.ipkg.blanks - + sc.makefile.blanks + sc.justfile.blanks + sc.ion.blanks - + sc.bash.blanks + sc.hamlet.blanks + sc.cassius.blanks - + sc.lucius.blanks + sc.julius.blanks + sc.mercury.blanks - + sc.yacc.blanks + sc.lex.blanks + sc.coq.blanks + sc.jupyter.blanks - + sc.java.blanks + sc.scala.blanks + sc.erlang.blanks + sc.elixir.blanks - + sc.pony.blanks + sc.clojure.blanks + sc.cabal_project.blanks - + sc.assembly.blanks + sc.nix.blanks + sc.php.blanks - + sc.javascript.blanks + sc.kotlin.blanks + sc.fsharp.blanks - + sc.fortran.blanks + sc.swift.blanks + sc.csharp.blanks + sc.nim.blanks - + sc.cpp_header.blanks + sc.elisp.blanks + sc.plaintext.blanks - + sc.rakefile.blanks + sc.llvm.blanks + sc.autoconf.blanks - + sc.batch.blanks + sc.powershell.blanks + sc.m4.blanks - + sc.objective_c.blanks - + sc.automake.blanks, comments = sc.rust.comments + sc.haskell.comments - + sc.ats.comments + sc.python.comments + sc.vimscript.comments - + sc.elm.comments + sc.idris.comments + sc.madlang.comments - + sc.tex.comments + sc.markdown.comments + sc.yaml.comments - + sc.toml.comments + sc.cabal.comments + sc.happy.comments - + sc.alex.comments + sc.go.comments + sc.html.comments + sc.css.comments - + sc.verilog.comments + sc.vhdl.comments + sc.c.comments - + sc.purescript.comments + sc.futhark.comments + sc.brainfuck.comments - + sc.ruby.comments + sc.julia.comments + sc.perl.comments - + sc.ocaml.comments + sc.agda.comments + sc.cobol.comments - + sc.tcl.comments + sc.r.comments + sc.lua.comments + sc.cpp.comments - + sc.lalrpop.comments + sc.header.comments + sc.sixten.comments - + sc.dhall.comments + sc.ipkg.comments + sc.makefile.comments - + sc.justfile.comments + sc.ion.comments + sc.bash.comments - + sc.hamlet.comments + sc.cassius.comments + sc.lucius.comments - + sc.julius.comments + sc.mercury.comments + sc.yacc.comments - + sc.lex.comments + sc.coq.comments + sc.jupyter.comments - + sc.java.comments + sc.scala.comments + sc.erlang.comments - + sc.elixir.comments + sc.pony.comments + sc.clojure.comments - + sc.cabal_project.comments + sc.assembly.comments + sc.nix.comments - + sc.php.comments + sc.javascript.comments + sc.kotlin.comments - + sc.fsharp.comments + sc.fortran.comments + sc.swift.comments - + sc.csharp.comments + sc.nim.comments + sc.cpp_header.comments - + sc.elisp.comments + sc.plaintext.comments + sc.rakefile.comments - + sc.llvm.comments + sc.autoconf.comments + sc.batch.comments - + sc.powershell.comments + sc.m4.comments + sc.objective_c.comments - + sc.automake.comments, files = sc.rust.files + sc.haskell.files - + sc.ats.files + sc.python.files + sc.vimscript.files + sc.elm.files - + sc.idris.files + sc.madlang.files + sc.tex.files + sc.markdown.files - + sc.yaml.files + sc.toml.files + sc.cabal.files + sc.happy.files - + sc.alex.files + sc.go.files + sc.html.files + sc.css.files - + sc.verilog.files + sc.vhdl.files + sc.c.files + sc.purescript.files - + sc.futhark.files + sc.brainfuck.files + sc.ruby.files + sc.julia.files - + sc.perl.files + sc.ocaml.files + sc.agda.files + sc.cobol.files - + sc.tcl.files + sc.r.files + sc.lua.files + sc.cpp.files - + sc.lalrpop.files + sc.header.files + sc.sixten.files + sc.dhall.files - + sc.ipkg.files + sc.makefile.files + sc.justfile.files + sc.ion.files - + sc.bash.files + sc.hamlet.files + sc.cassius.files + sc.lucius.files - + sc.julius.files + sc.mercury.files + sc.yacc.files + sc.lex.files - + sc.coq.files + sc.jupyter.files + sc.java.files + sc.scala.files - + sc.erlang.files + sc.elixir.files + sc.pony.files + sc.clojure.files - + sc.cabal_project.files + sc.assembly.files + sc.nix.files - + sc.php.files + sc.javascript.files + sc.kotlin.files + sc.fsharp.files - + sc.fortran.files + sc.swift.files + sc.csharp.files + sc.nim.files - + sc.cpp_header.files + sc.elisp.files + sc.plaintext.files - + sc.rakefile.files + sc.llvm.files + sc.autoconf.files + sc.batch.files - + sc.powershell.files + sc.m4.files + sc.objective_c.files - + sc.automake.files } + var f = @{ lines = sc.rust.lines + + sc.haskell.lines + + sc.ats.lines + + sc.python.lines + + sc.vimscript.lines + + sc.elm.lines + + sc.idris.lines + + sc.madlang.lines + + sc.tex.lines + + sc.markdown.lines + + sc.yaml.lines + + sc.toml.lines + + sc.cabal.lines + + sc.happy.lines + + sc.alex.lines + + sc.go.lines + + sc.html.lines + + sc.css.lines + + sc.verilog.lines + + sc.vhdl.lines + + sc.c.lines + + sc.purescript.lines + + sc.futhark.lines + + sc.brainfuck.lines + + sc.ruby.lines + + sc.julia.lines + + sc.perl.lines + + sc.ocaml.lines + + sc.agda.lines + + sc.cobol.lines + + sc.tcl.lines + + sc.r.lines + + sc.lua.lines + + sc.cpp.lines + + sc.lalrpop.lines + + sc.header.lines + + sc.sixten.lines + + sc.dhall.lines + + sc.ipkg.lines + + sc.makefile.lines + + sc.justfile.lines + + sc.ion.lines + + sc.bash.lines + + sc.hamlet.lines + + sc.cassius.lines + + sc.lucius.lines + + sc.julius.lines + + sc.mercury.lines + + sc.yacc.lines + + sc.lex.lines + + sc.coq.lines + + sc.jupyter.lines + + sc.java.lines + + sc.scala.lines + + sc.erlang.lines + + sc.elixir.lines + + sc.pony.lines + + sc.clojure.lines + + sc.cabal_project.lines + + sc.assembly.lines + + sc.nix.lines + + sc.php.lines + + sc.javascript.lines + + sc.kotlin.lines + + sc.fsharp.lines + + sc.fortran.lines + + sc.swift.lines + + sc.csharp.lines + + sc.nim.lines + + sc.cpp_header.lines + + sc.elisp.lines + + sc.plaintext.lines + + sc.rakefile.lines + + sc.llvm.lines + + sc.autoconf.lines + + sc.batch.lines + + sc.powershell.lines + + sc.m4.lines + + sc.objective_c.lines + + sc.automake.lines + , blanks = sc.rust.blanks + + sc.haskell.blanks + + sc.ats.blanks + + sc.python.blanks + + sc.vimscript.blanks + + sc.elm.blanks + + sc.idris.blanks + + sc.madlang.blanks + + sc.tex.blanks + + sc.markdown.blanks + + sc.yaml.blanks + + sc.toml.blanks + + sc.cabal.blanks + + sc.happy.blanks + + sc.alex.blanks + + sc.go.blanks + + sc.html.blanks + + sc.css.blanks + + sc.verilog.blanks + + sc.vhdl.blanks + + sc.c.blanks + + sc.purescript.blanks + + sc.futhark.blanks + + sc.brainfuck.blanks + + sc.ruby.blanks + + sc.julia.blanks + + sc.perl.blanks + + sc.ocaml.blanks + + sc.agda.blanks + + sc.cobol.blanks + + sc.tcl.blanks + + sc.r.blanks + + sc.lua.blanks + + sc.cpp.blanks + + sc.lalrpop.blanks + + sc.header.blanks + + sc.sixten.blanks + + sc.dhall.blanks + + sc.ipkg.blanks + + sc.makefile.blanks + + sc.justfile.blanks + + sc.ion.blanks + + sc.bash.blanks + + sc.hamlet.blanks + + sc.cassius.blanks + + sc.lucius.blanks + + sc.julius.blanks + + sc.mercury.blanks + + sc.yacc.blanks + + sc.lex.blanks + + sc.coq.blanks + + sc.jupyter.blanks + + sc.java.blanks + + sc.scala.blanks + + sc.erlang.blanks + + sc.elixir.blanks + + sc.pony.blanks + + sc.clojure.blanks + + sc.cabal_project.blanks + + sc.assembly.blanks + + sc.nix.blanks + + sc.php.blanks + + sc.javascript.blanks + + sc.kotlin.blanks + + sc.fsharp.blanks + + sc.fortran.blanks + + sc.swift.blanks + + sc.csharp.blanks + + sc.nim.blanks + + sc.cpp_header.blanks + + sc.elisp.blanks + + sc.plaintext.blanks + + sc.rakefile.blanks + + sc.llvm.blanks + + sc.autoconf.blanks + + sc.batch.blanks + + sc.powershell.blanks + + sc.m4.blanks + + sc.objective_c.blanks + + sc.automake.blanks + , comments = sc.rust.comments + + sc.haskell.comments + + sc.ats.comments + + sc.python.comments + + sc.vimscript.comments + + sc.elm.comments + + sc.idris.comments + + sc.madlang.comments + + sc.tex.comments + + sc.markdown.comments + + sc.yaml.comments + + sc.toml.comments + + sc.cabal.comments + + sc.happy.comments + + sc.alex.comments + + sc.go.comments + + sc.html.comments + + sc.css.comments + + sc.verilog.comments + + sc.vhdl.comments + + sc.c.comments + + sc.purescript.comments + + sc.futhark.comments + + sc.brainfuck.comments + + sc.ruby.comments + + sc.julia.comments + + sc.perl.comments + + sc.ocaml.comments + + sc.agda.comments + + sc.cobol.comments + + sc.tcl.comments + + sc.r.comments + + sc.lua.comments + + sc.cpp.comments + + sc.lalrpop.comments + + sc.header.comments + + sc.sixten.comments + + sc.dhall.comments + + sc.ipkg.comments + + sc.makefile.comments + + sc.justfile.comments + + sc.ion.comments + + sc.bash.comments + + sc.hamlet.comments + + sc.cassius.comments + + sc.lucius.comments + + sc.julius.comments + + sc.mercury.comments + + sc.yacc.comments + + sc.lex.comments + + sc.coq.comments + + sc.jupyter.comments + + sc.java.comments + + sc.scala.comments + + sc.erlang.comments + + sc.elixir.comments + + sc.pony.comments + + sc.clojure.comments + + sc.cabal_project.comments + + sc.assembly.comments + + sc.nix.comments + + sc.php.comments + + sc.javascript.comments + + sc.kotlin.comments + + sc.fsharp.comments + + sc.fortran.comments + + sc.swift.comments + + sc.csharp.comments + + sc.nim.comments + + sc.cpp_header.comments + + sc.elisp.comments + + sc.plaintext.comments + + sc.rakefile.comments + + sc.llvm.comments + + sc.autoconf.comments + + sc.batch.comments + + sc.powershell.comments + + sc.m4.comments + + sc.objective_c.comments + + sc.automake.comments + , files = sc.rust.files + + sc.haskell.files + + sc.ats.files + + sc.python.files + + sc.vimscript.files + + sc.elm.files + + sc.idris.files + + sc.madlang.files + + sc.tex.files + + sc.markdown.files + + sc.yaml.files + + sc.toml.files + + sc.cabal.files + + sc.happy.files + + sc.alex.files + + sc.go.files + + sc.html.files + + sc.css.files + + sc.verilog.files + + sc.vhdl.files + + sc.c.files + + sc.purescript.files + + sc.futhark.files + + sc.brainfuck.files + + sc.ruby.files + + sc.julia.files + + sc.perl.files + + sc.ocaml.files + + sc.agda.files + + sc.cobol.files + + sc.tcl.files + + sc.r.files + + sc.lua.files + + sc.cpp.files + + sc.lalrpop.files + + sc.header.files + + sc.sixten.files + + sc.dhall.files + + sc.ipkg.files + + sc.makefile.files + + sc.justfile.files + + sc.ion.files + + sc.bash.files + + sc.hamlet.files + + sc.cassius.files + + sc.lucius.files + + sc.julius.files + + sc.mercury.files + + sc.yacc.files + + sc.lex.files + + sc.coq.files + + sc.jupyter.files + + sc.java.files + + sc.scala.files + + sc.erlang.files + + sc.elixir.files + + sc.pony.files + + sc.clojure.files + + sc.cabal_project.files + + sc.assembly.files + + sc.nix.files + + sc.php.files + + sc.javascript.files + + sc.kotlin.files + + sc.fsharp.files + + sc.fortran.files + + sc.swift.files + + sc.csharp.files + + sc.nim.files + + sc.cpp_header.files + + sc.elisp.files + + sc.plaintext.files + + sc.rakefile.files + + sc.llvm.files + + sc.autoconf.files + + sc.batch.files + + sc.powershell.files + + sc.m4.files + + sc.objective_c.files + + sc.automake.files + } in f end @@ -237,62 +470,85 @@ // function to print tabular output at the end fun make_table(isc : source_contents) : string = "-------------------------------------------------------------------------------\n \33[35mLanguage\33[0m \33[35mFiles\33[0m \33[35mLines\33[0m \33[35mCode\33[0m \33[35mComments\33[0m \33[35mBlanks\33[0m\n-------------------------------------------------------------------------------\n" - + maybe_table("Alex", isc.alex) + maybe_table("Agda", isc.agda) - + maybe_table("Assembly", isc.assembly) + maybe_table("ATS", isc.ats) - + maybe_table("Autoconf", isc.autoconf) + maybe_table( "Automake" - , isc.automake - ) + maybe_table("Bash", isc.bash) + maybe_table( "Batch" - , isc.batch - ) - + maybe_table("Brainfuck", isc.brainfuck) + maybe_table("C", isc.c) - + maybe_table("C Header", isc.header) + maybe_table( "C++ cpp_header" - , isc.cpp_header - ) + maybe_table("C++", isc.cpp) + maybe_table("C#", isc.csharp) - + maybe_table("Cabal", isc.cabal) + maybe_table( "Cabal Project" - , isc.cabal_project - ) + maybe_table("Cassius", isc.cassius) + maybe_table( "COBOL" - , isc.cobol - ) - + maybe_table("Coq", isc.coq) + maybe_table("CSS", isc.css) - + maybe_table("Dhall", isc.dhall) + maybe_table("Elixir", isc.elixir) - + maybe_table("Elm", isc.elm) + maybe_table("Emacs Lisp", isc.elisp) - + maybe_table("Erlang", isc.erlang) + maybe_table("F#", isc.fsharp) - + maybe_table("Fortran", isc.fortran) + maybe_table("Go", isc.go) - + maybe_table("Hamlet", isc.hamlet) + maybe_table("Happy", isc.happy) - + maybe_table("Haskell", isc.haskell) + maybe_table("HTML", isc.html) - + maybe_table("Idris", isc.idris) + maybe_table("iPKG", isc.ipkg) - + maybe_table("Ion", isc.ion) + maybe_table("Java", isc.java) - + maybe_table("JavaScript", isc.javascript) + maybe_table( "Julius" - , isc.julius - ) + maybe_table("Julia", isc.julia) - + maybe_table("Jupyter", isc.jupyter) + maybe_table( "Justfile" - , isc.justfile - ) + maybe_table("Kotlin", isc.kotlin) + maybe_table( "LALRPOP" - , isc.lalrpop - ) - + maybe_table("Lex", isc.lex) + maybe_table("LLVM", isc.llvm) - + maybe_table("Lua", isc.lua) + maybe_table("Lucius", isc.lucius) - + maybe_table("M4", isc.m4) + maybe_table("Madlang", isc.madlang) - + maybe_table("Makefile", isc.makefile) + maybe_table( "Margaret" - , isc.margaret - ) + maybe_table("Markdown", isc.markdown) - + maybe_table("Mercury", isc.mercury) + maybe_table("Nim", isc.nim) - + maybe_table("Nix", isc.nix) + maybe_table( "Objective C" - , isc.objective_c - ) + maybe_table("OCaml", isc.ocaml) + maybe_table("Perl", isc.perl) - + maybe_table("PHP", isc.php) + maybe_table("Plaintext", isc.plaintext) - + maybe_table("PowerShell", isc.powershell) + maybe_table( "Pony" - , isc.pony - ) + maybe_table("Python", isc.python) - + maybe_table("PureScript", isc.purescript) + maybe_table("R", isc.r) - + maybe_table("Rakefile", isc.rakefile) + maybe_table("Ruby", isc.ruby) - + maybe_table("Rust", isc.rust) + maybe_table("Scala", isc.scala) - + maybe_table("Sixten", isc.sixten) + maybe_table("Swift", isc.swift) - + maybe_table("TCL", isc.tcl) + maybe_table("TeX", isc.tex) - + maybe_table("TOML", isc.toml) + maybe_table("Verilog", isc.verilog) - + maybe_table("VHDL", isc.vhdl) + maybe_table( "Vimscript" - , isc.vimscript - ) + maybe_table("Yacc", isc.yacc) + maybe_table("YAML", isc.yaml) + + maybe_table("Alex", isc.alex) + + maybe_table("Agda", isc.agda) + + maybe_table("Assembly", isc.assembly) + + maybe_table("ATS", isc.ats) + + maybe_table("Autoconf", isc.autoconf) + + maybe_table("Automake", isc.automake) + + maybe_table("Bash", isc.bash) + + maybe_table("Batch", isc.batch) + + maybe_table("Brainfuck", isc.brainfuck) + + maybe_table("C", isc.c) + + maybe_table("C Header", isc.header) + + maybe_table("C++ cpp_header", isc.cpp_header) + + maybe_table("C++", isc.cpp) + + maybe_table("C#", isc.csharp) + + maybe_table("Cabal", isc.cabal) + + maybe_table("Cabal Project", isc.cabal_project) + + maybe_table("Cassius", isc.cassius) + + maybe_table("COBOL", isc.cobol) + + maybe_table("Coq", isc.coq) + + maybe_table("CSS", isc.css) + + maybe_table("Dhall", isc.dhall) + + maybe_table("Elixir", isc.elixir) + + maybe_table("Elm", isc.elm) + + maybe_table("Emacs Lisp", isc.elisp) + + maybe_table("Erlang", isc.erlang) + + maybe_table("F#", isc.fsharp) + + maybe_table("Fortran", isc.fortran) + + maybe_table("Go", isc.go) + + maybe_table("Hamlet", isc.hamlet) + + maybe_table("Happy", isc.happy) + + maybe_table("Haskell", isc.haskell) + + maybe_table("HTML", isc.html) + + maybe_table("Idris", isc.idris) + + maybe_table("iPKG", isc.ipkg) + + maybe_table("Ion", isc.ion) + + maybe_table("Java", isc.java) + + maybe_table("JavaScript", isc.javascript) + + maybe_table("Julius", isc.julius) + + maybe_table("Julia", isc.julia) + + maybe_table("Jupyter", isc.jupyter) + + maybe_table("Justfile", isc.justfile) + + maybe_table("Kotlin", isc.kotlin) + + maybe_table("LALRPOP", isc.lalrpop) + + maybe_table("Lex", isc.lex) + + maybe_table("LLVM", isc.llvm) + + maybe_table("Lua", isc.lua) + + maybe_table("Lucius", isc.lucius) + + maybe_table("M4", isc.m4) + + maybe_table("Madlang", isc.madlang) + + maybe_table("Makefile", isc.makefile) + + maybe_table("Margaret", isc.margaret) + + maybe_table("Markdown", isc.markdown) + + maybe_table("Mercury", isc.mercury) + + maybe_table("Nim", isc.nim) + + maybe_table("Nix", isc.nix) + + maybe_table("Objective C", isc.objective_c) + + maybe_table("OCaml", isc.ocaml) + + maybe_table("Perl", isc.perl) + + maybe_table("PHP", isc.php) + + maybe_table("Plaintext", isc.plaintext) + + maybe_table("PowerShell", isc.powershell) + + maybe_table("Pony", isc.pony) + + maybe_table("Python", isc.python) + + maybe_table("PureScript", isc.purescript) + + maybe_table("R", isc.r) + + maybe_table("Rakefile", isc.rakefile) + + maybe_table("Ruby", isc.ruby) + + maybe_table("Rust", isc.rust) + + maybe_table("Scala", isc.scala) + + maybe_table("Sixten", isc.sixten) + + maybe_table("Swift", isc.swift) + + maybe_table("TCL", isc.tcl) + + maybe_table("TeX", isc.tex) + + maybe_table("TOML", isc.toml) + + maybe_table("Verilog", isc.verilog) + + maybe_table("VHDL", isc.vhdl) + + maybe_table("Vimscript", isc.vimscript) + + maybe_table("Yacc", isc.yacc) + + maybe_table("YAML", isc.yaml) + "-------------------------------------------------------------------------------\n" + maybe_table("Total", sum_fields(isc)) + "-------------------------------------------------------------------------------\n" @@ -300,170 +556,188 @@ // Function to print output sorted by type of language. fun make_output(isc : source_contents) : string = with_nonempty( "\33[33mProgramming Languages:\33[0m\n" - , maybe_string("Agda", isc.agda.lines) + maybe_string( "Assembly" - , isc.assembly.lines - ) + maybe_string("ATS", isc.ats.lines) - + maybe_string("Brainfuck", isc.brainfuck.lines) + maybe_string( "C" - , isc.c.lines - ) + maybe_string( "C Header" - , isc.header.lines - ) - + maybe_string("C++", isc.cpp.lines) + maybe_string( "C++ Header" - , isc.cpp_header.lines - ) + maybe_string("C#", isc.csharp.lines) - + maybe_string("COBOL", isc.cobol.lines) + maybe_string( "Coq" - , isc.coq.lines - ) + maybe_string("Elixir", isc.elixir.lines) - + maybe_string("Elm", isc.elm.lines) + maybe_string( "Erlang" - , isc.erlang.lines - ) + maybe_string("F#", isc.fsharp.lines) - + maybe_string("Fortran", isc.fortran.lines) + maybe_string( "Go" - , isc.go.lines - ) + maybe_string("Haskell", isc.haskell.lines) - + maybe_string("Idris", isc.idris.lines) + maybe_string( "Kotline" - , isc.kotlin.lines - ) + maybe_string("Java", isc.java.lines) - + maybe_string("Julia", isc.julia.lines) + maybe_string( "Lua" - , isc.lua.lines - ) + maybe_string("Margaret", isc.margaret.lines) - + maybe_string("Mercury", isc.mercury.lines) + maybe_string( "Nim" - , isc.nim.lines - ) + maybe_string( "Objective C" - , isc.objective_c.lines - ) - + maybe_string("OCaml", isc.ocaml.lines) + maybe_string( "Perl" - , isc.perl.lines - ) + maybe_string("Pony", isc.pony.lines) + , maybe_string("Agda", isc.agda.lines) + + maybe_string("Assembly", isc.assembly.lines) + + maybe_string("ATS", isc.ats.lines) + + maybe_string("Brainfuck", isc.brainfuck.lines) + + maybe_string("C", isc.c.lines) + + maybe_string("C Header", isc.header.lines) + + maybe_string("C++", isc.cpp.lines) + + maybe_string("C++ Header", isc.cpp_header.lines) + + maybe_string("C#", isc.csharp.lines) + + maybe_string("COBOL", isc.cobol.lines) + + maybe_string("Coq", isc.coq.lines) + + maybe_string("Elixir", isc.elixir.lines) + + maybe_string("Elm", isc.elm.lines) + + maybe_string("Erlang", isc.erlang.lines) + + maybe_string("F#", isc.fsharp.lines) + + maybe_string("Fortran", isc.fortran.lines) + + maybe_string("Go", isc.go.lines) + + maybe_string("Haskell", isc.haskell.lines) + + maybe_string("Idris", isc.idris.lines) + + maybe_string("Kotline", isc.kotlin.lines) + + maybe_string("Java", isc.java.lines) + + maybe_string("Julia", isc.julia.lines) + + maybe_string("Lua", isc.lua.lines) + + maybe_string("Margaret", isc.margaret.lines) + + maybe_string("Mercury", isc.mercury.lines) + + maybe_string("Nim", isc.nim.lines) + + maybe_string("Objective C", isc.objective_c.lines) + + maybe_string("OCaml", isc.ocaml.lines) + + maybe_string("Perl", isc.perl.lines) + + maybe_string("Pony", isc.pony.lines) + maybe_string("PureScript", isc.purescript.lines) - + maybe_string("Python", isc.python.lines) + maybe_string( "R" - , isc.r.lines - ) + maybe_string("Ruby", isc.ruby.lines) - + maybe_string("Rust", isc.rust.lines) + maybe_string( "Scala" - , isc.scala.lines - ) + maybe_string("Sixten", isc.sixten.lines) - + maybe_string("Swift", isc.swift.lines) + maybe_string( "TCL" - , isc.tcl.lines - ) - ) + with_nonempty( "\n\33[33mEditor Plugins:\33[0m\n" - , maybe_string("Emacs Lisp", isc.elisp.lines) - + maybe_string("Vimscript", isc.vimscript.lines) - ) + with_nonempty( "\n\33[33mDocumentation:\33[0m\n" - , maybe_string("Markdown", isc.markdown.lines) - + maybe_string("Plaintext", isc.plaintext.lines) - + maybe_string("TeX", isc.tex.lines) - ) + with_nonempty( "\n\33[33mConfiguration:\33[0m\n" - , maybe_string("Cabal", isc.cabal.lines) - + maybe_string( "Cabal Project" - , isc.cabal_project.lines - ) + maybe_string( "Dhall" - , isc.dhall.lines - ) - + maybe_string("iPKG", isc.ipkg.lines) - + maybe_string("TOML", isc.toml.lines) - + maybe_string("YAML", isc.yaml.lines) - ) + with_nonempty( "\n\33[33mShell:\33[0m\n" - , maybe_string( "Bash" - , isc.bash.lines - ) - + maybe_string( "Batch" - , isc.batch.lines - ) - + maybe_string("Ion", isc.ion.lines) - + maybe_string( "PowerShell" - , isc.powershell.lines - ) - ) + + maybe_string("Python", isc.python.lines) + + maybe_string("R", isc.r.lines) + + maybe_string("Ruby", isc.ruby.lines) + + maybe_string("Rust", isc.rust.lines) + + maybe_string("Scala", isc.scala.lines) + + maybe_string("Sixten", isc.sixten.lines) + + maybe_string("Swift", isc.swift.lines) + + maybe_string("TCL", isc.tcl.lines) + ) + + with_nonempty( "\n\33[33mEditor Plugins:\33[0m\n" + , maybe_string("Emacs Lisp", isc.elisp.lines) + + maybe_string("Vimscript", isc.vimscript.lines) + ) + + with_nonempty( "\n\33[33mDocumentation:\33[0m\n" + , maybe_string("Markdown", isc.markdown.lines) + + maybe_string("Plaintext", isc.plaintext.lines) + + maybe_string("TeX", isc.tex.lines) + ) + + with_nonempty( "\n\33[33mConfiguration:\33[0m\n" + , maybe_string("Cabal", isc.cabal.lines) + + maybe_string("Cabal Project", isc.cabal_project.lines) + + maybe_string("Dhall", isc.dhall.lines) + + maybe_string("iPKG", isc.ipkg.lines) + + maybe_string("TOML", isc.toml.lines) + + maybe_string("YAML", isc.yaml.lines) + ) + + with_nonempty( "\n\33[33mShell:\33[0m\n" + , maybe_string("Bash", isc.bash.lines) + + maybe_string("Batch", isc.batch.lines) + + maybe_string("Ion", isc.ion.lines) + + maybe_string("PowerShell", isc.powershell.lines) + ) + with_nonempty( "\n\33[33mParser Generators:\33[0m\n" - , maybe_string("Alex", isc.alex.lines) + maybe_string( "Happy" - , isc.happy.lines - ) + maybe_string("LALRPOP", isc.lalrpop.lines) - + maybe_string("Lex", isc.lex.lines) + maybe_string( "Yacc" - , isc.yacc.lines - ) - ) + with_nonempty( "\n\33[33mWeb:\33[0m\n" - , maybe_string("Cassius", isc.cassius.lines) + maybe_string( "CSS" - , isc.css.lines - ) - + maybe_string("Hamlet", isc.hamlet.lines) + maybe_string( "HTML" - , isc.html.lines - ) - + maybe_string("JavaScript", isc.javascript.lines) - + maybe_string("Julius", isc.julius.lines) + maybe_string( "Lucius" - , isc.lucius.lines - ) - ) + with_nonempty( "\n\33[33mHardware:\33[0m\n" - , maybe_string("Verilog", isc.verilog.lines) - + maybe_string("VHDL", isc.vhdl.lines) - ) + with_nonempty( "\n\33[33mNotebooks:\33[0m\n" - , maybe_string("Jupyter", isc.jupyter.lines) - ) + with_nonempty( "\n\33[33mOther:\33[0m\n" - , maybe_string( "Autoconf" - , isc.autoconf.lines - ) - + maybe_string( "Automake" - , isc.automake.lines - ) - + maybe_string( "Justfile" - , isc.justfile.lines - ) - + maybe_string( "LLVM" - , isc.llvm.lines - ) - + maybe_string("M4", isc.m4.lines) - + maybe_string( "Madlang" - , isc.madlang.lines - ) - + maybe_string( "Makefile" - , isc.makefile.lines - ) - + maybe_string( "Rakefile" - , isc.rakefile.lines - ) - ) + , maybe_string("Alex", isc.alex.lines) + + maybe_string("Happy", isc.happy.lines) + + maybe_string("LALRPOP", isc.lalrpop.lines) + + maybe_string("Lex", isc.lex.lines) + + maybe_string("Yacc", isc.yacc.lines) + ) + + with_nonempty( "\n\33[33mWeb:\33[0m\n" + , maybe_string("Cassius", isc.cassius.lines) + + maybe_string("CSS", isc.css.lines) + + maybe_string("Hamlet", isc.hamlet.lines) + + maybe_string("HTML", isc.html.lines) + + maybe_string("JavaScript", isc.javascript.lines) + + maybe_string("Julius", isc.julius.lines) + + maybe_string("Lucius", isc.lucius.lines) + ) + + with_nonempty( "\n\33[33mHardware:\33[0m\n" + , maybe_string("Verilog", isc.verilog.lines) + + maybe_string("VHDL", isc.vhdl.lines) + ) + + with_nonempty( "\n\33[33mNotebooks:\33[0m\n" + , maybe_string("Jupyter", isc.jupyter.lines) + ) + + with_nonempty( "\n\33[33mOther:\33[0m\n" + , maybe_string("Autoconf", isc.autoconf.lines) + + maybe_string("Automake", isc.automake.lines) + + maybe_string("Justfile", isc.justfile.lines) + + maybe_string("LLVM", isc.llvm.lines) + + maybe_string("M4", isc.m4.lines) + + maybe_string("Madlang", isc.madlang.lines) + + maybe_string("Makefile", isc.makefile.lines) + + maybe_string("Rakefile", isc.rakefile.lines) + ) fun add_contents(x : source_contents, y : source_contents) : source_contents = let - var next = @{ rust = x.rust + y.rust, haskell = x.haskell - + y.haskell, ats = x.ats + y.ats, python = x.python - + y.python, vimscript = x.vimscript + y.vimscript, elm = x.elm - + y.elm, idris = x.idris + y.idris, madlang = x.madlang - + y.madlang, tex = x.tex + y.tex, markdown = x.markdown - + y.markdown, yaml = x.yaml + y.yaml, toml = x.toml - + y.toml, cabal = x.cabal + y.cabal, happy = x.happy - + y.happy, alex = x.alex + y.alex, go = x.go + y.go, html = x.html - + y.html, css = x.css + y.css, verilog = x.verilog - + y.verilog, vhdl = x.vhdl + y.vhdl, c = x.c - + y.c, purescript = x.purescript + y.purescript, futhark = x.futhark - + y.futhark, brainfuck = x.brainfuck + y.brainfuck, ruby = x.ruby - + y.ruby, julia = x.julia + y.julia, perl = x.perl - + y.perl, ocaml = x.ocaml + y.ocaml, agda = x.agda - + y.agda, cobol = x.cobol + y.cobol, tcl = x.tcl + y.tcl, r = x.r - + y.r, lua = x.lua + y.lua, cpp = x.cpp + y.cpp, lalrpop = x.lalrpop - + y.lalrpop, header = x.header + y.header, sixten = x.sixten - + y.sixten, dhall = x.dhall + y.dhall, ipkg = x.ipkg - + y.ipkg, makefile = x.makefile + y.makefile, justfile = x.justfile - + y.justfile, ion = x.ion + y.ion, bash = x.bash - + y.bash, hamlet = x.hamlet + y.hamlet, cassius = x.cassius - + y.cassius, lucius = x.lucius + y.lucius, julius = x.julius - + y.julius, mercury = x.mercury + y.mercury, yacc = x.yacc - + y.yacc, lex = x.lex + y.lex, coq = x.coq + y.coq, jupyter = x.jupyter - + y.jupyter, java = x.java + y.java, scala = x.scala - + y.scala, erlang = x.erlang + y.erlang, elixir = x.elixir - + y.elixir, pony = x.pony + y.pony, clojure = x.clojure - + y.clojure, cabal_project = x.cabal_project - + y.cabal_project, assembly = x.assembly + y.assembly, nix = x.nix - + y.nix, php = x.php + y.php, javascript = x.javascript - + y.javascript, kotlin = x.kotlin + y.kotlin, fsharp = x.fsharp - + y.fsharp, fortran = x.fortran + y.fortran, swift = x.swift - + y.swift, csharp = x.csharp + y.csharp, nim = x.nim - + y.nim, cpp_header = x.cpp_header + y.cpp_header, elisp = x.elisp - + y.elisp, plaintext = x.plaintext + y.plaintext, rakefile = x.rakefile - + y.rakefile, llvm = x.llvm + y.llvm, autoconf = x.autoconf - + y.autoconf, batch = x.batch + y.batch, powershell = x.powershell - + y.powershell, m4 = x.m4 + y.m4, objective_c = x.objective_c - + y.objective_c, automake = x.automake - + y.automake, margaret = x.margaret + y.margaret } : source_contents + var next = @{ rust = x.rust + y.rust + , haskell = x.haskell + y.haskell + , ats = x.ats + y.ats + , python = x.python + y.python + , vimscript = x.vimscript + y.vimscript + , elm = x.elm + y.elm + , idris = x.idris + y.idris + , madlang = x.madlang + y.madlang + , tex = x.tex + y.tex + , markdown = x.markdown + y.markdown + , yaml = x.yaml + y.yaml + , toml = x.toml + y.toml + , cabal = x.cabal + y.cabal + , happy = x.happy + y.happy + , alex = x.alex + y.alex + , go = x.go + y.go + , html = x.html + y.html + , css = x.css + y.css + , verilog = x.verilog + y.verilog + , vhdl = x.vhdl + y.vhdl + , c = x.c + y.c + , purescript = x.purescript + y.purescript + , futhark = x.futhark + y.futhark + , brainfuck = x.brainfuck + y.brainfuck + , ruby = x.ruby + y.ruby + , julia = x.julia + y.julia + , perl = x.perl + y.perl + , ocaml = x.ocaml + y.ocaml + , agda = x.agda + y.agda + , cobol = x.cobol + y.cobol + , tcl = x.tcl + y.tcl + , r = x.r + y.r + , lua = x.lua + y.lua + , cpp = x.cpp + y.cpp + , lalrpop = x.lalrpop + y.lalrpop + , header = x.header + y.header + , sixten = x.sixten + y.sixten + , dhall = x.dhall + y.dhall + , ipkg = x.ipkg + y.ipkg + , makefile = x.makefile + y.makefile + , justfile = x.justfile + y.justfile + , ion = x.ion + y.ion + , bash = x.bash + y.bash + , hamlet = x.hamlet + y.hamlet + , cassius = x.cassius + y.cassius + , lucius = x.lucius + y.lucius + , julius = x.julius + y.julius + , mercury = x.mercury + y.mercury + , yacc = x.yacc + y.yacc + , lex = x.lex + y.lex + , coq = x.coq + y.coq + , jupyter = x.jupyter + y.jupyter + , java = x.java + y.java + , scala = x.scala + y.scala + , erlang = x.erlang + y.erlang + , elixir = x.elixir + y.elixir + , pony = x.pony + y.pony + , clojure = x.clojure + y.clojure + , cabal_project = x.cabal_project + y.cabal_project + , assembly = x.assembly + y.assembly + , nix = x.nix + y.nix + , php = x.php + y.php + , javascript = x.javascript + y.javascript + , kotlin = x.kotlin + y.kotlin + , fsharp = x.fsharp + y.fsharp + , fortran = x.fortran + y.fortran + , swift = x.swift + y.swift + , csharp = x.csharp + y.csharp + , nim = x.nim + y.nim + , cpp_header = x.cpp_header + y.cpp_header + , elisp = x.elisp + y.elisp + , plaintext = x.plaintext + y.plaintext + , rakefile = x.rakefile + y.rakefile + , llvm = x.llvm + y.llvm + , autoconf = x.autoconf + y.autoconf + , batch = x.batch + y.batch + , powershell = x.powershell + y.powershell + , m4 = x.m4 + y.m4 + , objective_c = x.objective_c + y.objective_c + , automake = x.automake + y.automake + , margaret = x.margaret + y.margaret + } : source_contents in next end @@ -768,8 +1042,7 @@ in result end - | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " - + s) + | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " + s) ; unknown ) end @@ -788,8 +1061,7 @@ in s end - | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " - + s) + | ~None_vt() => ( println!("\33[33mWarning:\33[0m could not open file at " + s) ; "" ) in @@ -1107,8 +1379,10 @@ if test_file_exists(next) || next = "" then step_stream(acc, next, next, excludes) else - (prerr("\33[31mError:\33[0m directory '" + next - + "' does not exist\n") ; exit(1) ; acc) + ( prerr("\33[31mError:\33[0m directory '" + next + "' does not exist\n") + ; exit(1) + ; acc + ) ) fun is_flag(s : string) : bool = @@ -1118,8 +1392,10 @@ let val acc_r = ref(acc) val () = if is_flag(s) then - (println!("Error: flag " + s - + " found where a directory name was expected") ; exit(0) ; ()) + ( println!("Error: flag " + s + " found where a directory name was expected") + ; exit(0) + ; () + ) else acc_r->excludes := list_cons(s, acc.excludes) in @@ -1137,23 +1413,33 @@ | "--no-table" => if not(acc.no_table) then acc_r->no_table := true else - (println!("\33[31mError:\33[0m flag " + s - + " cannot appear twice") ; exit(0) ; ()) + ( println!("\33[31mError:\33[0m flag " + s + " cannot appear twice") + ; exit(0) + ; () + ) | "-t" => if not(acc.no_table) then acc_r->no_table := true else - (println!("\33[31mError:\33[0m flag " + s - + " cannot appear twice") ; exit(0) ; ()) + ( println!("\33[31mError:\33[0m flag " + s + " cannot appear twice") + ; exit(0) + ; () + ) | "--parallel" => acc_r->parallel := true | "-p" => acc_r->parallel := true | "--version" => acc_r->version := true | "-V" => acc_r->version := true - | "-e" => (println!("\33[31mError:\33[0m flag " + s - + " must be followed by an argument") ; exit(0) ; ()) - | "--exclude" => (println!("\33[31mError:\33[0m flag " + s - + " must be followed by an argument") ; exit(0) ; ()) - | _ => (println!("\33[31mError:\33[0m flag '" + s - + "' not recognized") ; exit(0) ; ()) + | "-e" => ( println!("\33[31mError:\33[0m flag " + s + " must be followed by an argument") + ; exit(0) + ; () + ) + | "--exclude" => ( println!("\33[31mError:\33[0m flag " + s + " must be followed by an argument") + ; exit(0) + ; () + ) + | _ => ( println!("\33[31mError:\33[0m flag '" + s + "' not recognized") + ; exit(0) + ; () + ) else if not(is_first) then acc_r->includes := list_cons(s, acc.includes) diff --git a/test/data/toml-parse.out b/test/data/toml-parse.out --- a/test/data/toml-parse.out +++ b/test/data/toml-parse.out @@ -33,15 +33,15 @@ val g = x.modify in @{ modify = llam c = - - begin - let - val (y, z): (cstream, a) = g(c) - val w: b = f(z) - in - (cloptr_free($UN.castvwtp0(f)); cloptr_free($UN.castvwtp0(g)); (y, w)) - end - end } + + begin + let + val (y, z): (cstream, a) = g(c) + val w: b = f(z) + in + (cloptr_free($UN.castvwtp0(f)); cloptr_free($UN.castvwtp0(g)); (y, w)) + end + end } end extern @@ -55,16 +55,16 @@ fun chain {a : vtype}{b : vtype} (x : parser(a), y : parser(b)) : parser(b) = @{ modify = llam c = - let - val f = x.modify - val g = y.modify - val (pre_res, _) = f(c) - val (res, y) = g(pre_res) - val _ = cloptr_free($UN.castvwtp0(f)) - val _ = cloptr_free($UN.castvwtp0(g)) - in - (res, y) - end } + let + val f = x.modify + val g = y.modify + val (pre_res, _) = f(c) + val (res, y) = g(pre_res) + val _ = cloptr_free($UN.castvwtp0(f)) + val _ = cloptr_free($UN.castvwtp0(g)) + in + (res, y) + end } fun run_parser {a : vtype} (in_stream : cstream, parser : parser(a)) : a =