version bump

.travis.yml

@@ -50,7 +50,7 @@ script:
  arm-linux-gnueabihf-gcc -v
  atspkg clean
  atspkg nuke
- atspkg build --target=arm-linux-gnueabihf ; exit 0
+ atspkg build --target=arm-linux-gnueabihf
  mv target/poly poly-$TARGET
  else
  travis_wait 45 atspkg build

atspkg.dhall

@@ -6,13 +6,13 @@ let not = https://ipfs.io/ipfs/QmdtKd5Q7tebdo6rXfZed4kN6DXmErRQHJ4PsNCtca9GbB/Pr
 in
 
 {- Configuration -}
-let cross = True
+let cross = False
 in
 
 let parallel = True
 in
 
-let icc = False
+let cc = "icc"
 in
 
 {- Configuration helpers -}
@@ -34,11 +34,6 @@ let native =
  else ([] : List Text)
 in
 
-let cc = if icc
- then "icc"
- else "gcc"
-in
-
 prelude.default ⫽
  { bin =
  [

src/cli.dats

@@ -14,7 +14,7 @@ vtypedef command_line = @{ version = bool
  }
 
 fn version() : void =
- println!("polygot version 0.4.38\nCopyright (c) 2018 Vanessa McHale")
+ println!("polygot version 0.4.39\nCopyright (c) 2018 Vanessa McHale")
 
 fn help() : void =
  print("polyglot - Count lines of code quickly.

src/filetype.sats

@@ -88,6 +88,7 @@ vtypedef source_contents = @{ rust = file
  , greencard = file
  , cmm = file
  , fluid = file
+ , plutus = file
  }
 
 // Reference to source_contents; used to update the structure.
@@ -182,3 +183,4 @@ datavtype pl_type =
  | greencard of file
  | cmm of file
  | fluid of file
+ | plutus of file

src/print.dats

@@ -124,6 +124,7 @@ fun sum_fields(sc : source_contents) : file =
  + sc.m4.lines
  + sc.objective_c.lines
  + sc.automake.lines
+ + sc.plutus.lines
  , blanks = sc.rust.blanks
  + sc.haskell.blanks
  + sc.ats.blanks
@@ -204,6 +205,7 @@ fun sum_fields(sc : source_contents) : file =
  + sc.m4.blanks
  + sc.objective_c.blanks
  + sc.automake.blanks
+ + sc.plutus.blanks
  , comments = sc.rust.comments
  + sc.haskell.comments
  + sc.ats.comments
@@ -284,6 +286,7 @@ fun sum_fields(sc : source_contents) : file =
  + sc.m4.comments
  + sc.objective_c.comments
  + sc.automake.comments
+ + sc.plutus.comments
  , files = sc.rust.files
  + sc.haskell.files
  + sc.ats.files
@@ -364,6 +367,7 @@ fun sum_fields(sc : source_contents) : file =
  + sc.m4.files
  + sc.objective_c.files
  + sc.automake.files
+ + sc.plutus.files
  }
  in
  f
@@ -438,6 +442,7 @@ fun make_table(isc : source_contents) : string =
  + maybe_table("Perl", isc.perl)
  + maybe_table("PHP", isc.php)
  + maybe_table("Plaintext", isc.plaintext)
+ + maybe_table("Plutus", isc.plutus)
  + maybe_table("PowerShell", isc.powershell)
  + maybe_table("Pony", isc.pony)
  + maybe_table("Python", isc.python)
@@ -569,6 +574,7 @@ fun make_output(isc : source_contents) : string =
  )
  + with_nonempty("\n\33[33mGUIs:\33[0m\n", maybe_string("FLTK Data", isc.fluid.lines))
  + with_nonempty("\n\33[33mNotebooks:\33[0m\n", maybe_string("Jupyter", isc.jupyter.lines))
+ + with_nonempty("\n\33[33mContract Languages:\33[0m\n", maybe_string("Plutus", isc.plutus.lines))
  + with_nonempty( "\n\33[33mOther:\33[0m\n"
  , maybe_string("Autoconf", isc.autoconf.lines)
  + maybe_string("Automake", isc.automake.lines)

src/shared.dats

@@ -126,6 +126,7 @@ fn add_contents(x : source_contents, y : source_contents) : source_contents =
  , greencard = x.greencard + y.greencard
  , cmm = x.cmm + y.cmm
  , fluid = x.fluid + y.fluid
+ , plutus = x.plutus + y.plutus
  } : source_contents
  in
  next
@@ -222,6 +223,7 @@ fn adjust_contents(prev : source_contents, scf : pl_type) : source_contents =
  | ~greencard n => sc_r -> greencard := prev.greencard + n
  | ~cmm n => sc_r -> cmm := prev.cmm + n
  | ~fluid n => sc_r -> fluid := prev.fluid + n
+ | ~plutus n => sc_r -> plutus := prev.plutus + n
  | ~unknown _ => ()
  in
  !sc_r
@@ -482,6 +484,7 @@ fn prune_extension(s : string, file_proper : string) : pl_type =
  | "am" => automake(line_count(s, Some_vt("#")))
  | "mgt" => margaret(line_count(s, Some_vt("--")))
  | "carp" => carp(line_count(s, Some_vt(";")))
+ | "pls" => plutus(line_count(s, None_vt))
  | "" => match_filename(s)
  | "sh" => match_filename(s)
  | "yamllint" => match_filename(s)
@@ -624,6 +627,7 @@ fun empty_contents() : source_contents =
  , greencard = empty_file
  , cmm = empty_file
  , fluid = empty_file
+ , plutus = empty_file
  } : source_contents
  in
  isc

src/utils.dats

@@ -98,3 +98,4 @@ fun free_pl(pl : pl_type) : void =
  | ~greencard _ => ()
  | ~cmm _ => ()
  | ~fluid _ => ()
+ | ~plutus _ => ()