asv/usv

CHANGELOG.md

@@ -1,6 +1,7 @@
   * Better error messages when a field is out of bounds
   * Better error message on empty `|>` (`fold1`)
   * Fix parsing bug in curried binary operators
+  * Add `--usv` command-line flag
 
 # 2.0.3.0
 

src/A.hs

@@ -377,7 +377,7 @@ instance Show C where show=show.pretty
 data D a = SetFS T.Text | SetRS T.Text
          | FunDecl (Nm a) [Nm a] (E a)
          | FlushDecl
-         | SetAsv | SetOFS T.Text | SetORS T.Text
+         | SetAsv | SetUsv | SetOFS T.Text | SetORS T.Text
          deriving (Functor)
 
 instance Pretty (D a) where
@@ -386,6 +386,7 @@ instance Pretty (D a) where
     pretty (FunDecl n ns e) = "fn" <+> pretty n <> tupled (pretty <$> ns) <+> ":=" <#> indent 2 (pretty e <> ";")
     pretty FlushDecl        = ":flush;"
     pretty SetAsv           = ":set asv;"
+    pretty SetUsv           = ":set usv;"
     pretty (SetOFS sep)     = ":set ofs :=" <+> "'" <> pretty sep <> "';"
     pretty (SetORS sep)     = ":set ors :=" <+> "'" <> pretty sep <> "';"
 
@@ -403,6 +404,7 @@ getS :: Program a -> (Maybe T.Text, Maybe T.Text)
 getS (Program ds _) = foldl' go (Nothing, Nothing) ds where
     go (_, rs) (SetFS bs) = (Just bs, rs)
     go _ SetAsv           = (Just "\\x1f", Just "\\x1e")
+    go _ SetUsv           = (Just "␞",Just "␟")
     go (fs, _) (SetRS bs) = (fs, Just bs)
     go next _             = next
 

src/A/I.hs

@@ -41,7 +41,7 @@ lβ e = state (`β` e)
 
 iD :: D T -> RM T ()
 iD (FunDecl n [] e) = do {eI <- iE e; modify (bind n eI)}
-iD SetFS{} = pure (); iD SetRS{} = pure (); iD SetAsv = pure ()
+iD SetFS{} = pure (); iD SetRS{} = pure (); iD SetAsv = pure (); iD SetUsv = pure ()
 iD SetORS{} = pure (); iD SetOFS{} = pure (); iD FlushDecl{} = pure ()
 iD FunDecl{} = desugar
 

src/L.x

@@ -143,6 +143,8 @@ tokens :-
         if                       { mkKw KwIf }
         then                     { mkKw KwThen }
         else                     { mkKw KwElse }
+        asv                      { mkKw KwAsv }
+        usv                      { mkKw KwUsv }
 
         fs                       { mkRes VarFs }
         rs                       { mkRes VarRs }
@@ -366,9 +368,8 @@ data Keyword = KwLet
              | KwFlush
              | KwFn
              | KwInclude
-             | KwIf
-             | KwThen
-             | KwElse
+             | KwIf | KwThen | KwElse
+             | KwAsv | KwUsv
 
 -- | Reserved/special variables
 data Var = VarX
@@ -404,6 +405,8 @@ instance Pretty Keyword where
     pretty KwIf      = "if"
     pretty KwThen    = "then"
     pretty KwElse    = "else"
+    pretty KwUsv     = "usv"
+    pretty KwAsv     = "asv"
 
 data Builtin = BuiltinIParse
              | BuiltinFParse

src/Parser.y

@@ -118,6 +118,8 @@ import Prettyprinter (Pretty (pretty), (<+>))
     if { TokKeyword $$ KwIf }
     then { TokKeyword $$ KwThen }
     else { TokKeyword $$ KwElse }
+    usv { TokKeyword $$ KwUsv }
+    asv { TokKeyword $$ KwAsv }
 
     x { TokResVar $$ VarX }
     y { TokResVar $$ VarY }
@@ -216,6 +218,8 @@ D :: { D AlexPosn }
   | set rs defEq rr semicolon { SetRS (rr $4) }
   | set ofs defEq strLit semicolon { SetOFS (strTok $4) }
   | set ors defEq strLit semicolon { SetORS (strTok $4) }
+  | set asv semicolon { SetAsv }
+  | set usv semicolon { SetUsv }
   | flush semicolon { FlushDecl }
   | fn name Args defEq E semicolon { FunDecl $2 $3 $5 }
   | fn name defEq E semicolon { FunDecl $2 [] $4 }

src/Ty.hs

@@ -254,6 +254,7 @@ tyDS s (SetRS bs)  = pure (SetRS bs, s)
 tyDS s (SetOFS bs) = pure (SetOFS bs, s)
 tyDS s (SetORS bs) = pure (SetORS bs, s)
 tyDS s SetAsv      = pure (SetAsv, s)
+tyDS s SetUsv      = pure (SetUsv, s)
 tyDS s FlushDecl   = pure (FlushDecl, s)
 tyDS s (FunDecl n@(Nm _ (U i) _) [] e) = do
     (e', s') <- tyES s e

vscode/syntaxes/jacinda.dhall

@@ -50,7 +50,7 @@ in  { fileTypes = [ "jac" ]
               }
           , TextMate.MatchRe
               { match =
-                  "(splitc|sprintf|option|match|captures|fp|nf|rs|fs|ors|ofs|ix|substr|split|min|max|Some|None|mapMaybe|dedup|filter|fold|fold1|scan|dedupOn|catMaybes)"
+                  "(splitc|sprintf|option|match|captures|fp|nf|rs|fs|ors|ofs|asv|usv|ix|substr|split|min|max|Some|None|mapMaybe|dedup|filter|fold|fold1|scan|dedupOn|catMaybes)"
               , name = "constant.language"
               }
           , TextMate.MatchRe

vscode/syntaxes/jacinda.tmLanguage.json

@@ -21,7 +21,7 @@
       "name": "keyword"
     },
     {
-      "match": "(splitc|sprintf|option|match|captures|fp|nf|rs|fs|ors|ofs|ix|substr|split|min|max|Some|None|mapMaybe|dedup|filter|fold|fold1|scan|dedupOn|catMaybes)",
+      "match": "(splitc|sprintf|option|match|captures|fp|nf|rs|fs|ors|ofs|asv|usv|ix|substr|split|min|max|Some|None|mapMaybe|dedup|filter|fold|fold1|scan|dedupOn|catMaybes)",
       "name": "constant.language"
     },
     {