Remove '-i' and '-j' as short-hand options

These are (a) only used by the runtime and/or (b) only used seldomly.
Hence, we may as well open up for these to be used for something
different, e.g. modules

Author: ssoelvsten

compiler/app/Main.hs

@@ -43,7 +43,7 @@ import System.FilePath
 ----- COMPILER FLAGS -----------------------------------------------------------
 
 data Flag
-  = IRMode
+  = TextIRMode
   | JSONIRMode
   | LibMode
   | NoRawOpt
@@ -55,12 +55,12 @@ data Flag
 
 options :: [OptDescr Flag]
 options =
-  [ Option ['i'] ["ir"]        (NoArg IRMode)             "ir interactive mode"
-  , Option ['j'] ["json"]      (NoArg JSONIRMode)         "ir json interactive mode"
+  [ Option []    ["text-ir"]   (NoArg TextIRMode)         "ir interactive mode (text)"
+  , Option []    ["json-ir"]   (NoArg JSONIRMode)         "ir interactive mode (json)"
   , Option []    ["no-rawopt"] (NoArg NoRawOpt)           "disable Raw optimization"
   , Option ['v'] ["verbose"]   (NoArg Verbose)            "verbose output"
   , Option ['d'] ["debug"]     (NoArg Debug)              "debugging information in the .js file"
-  , Option []    ["lib"]       (NoArg LibMode)            "compiling a library"
+  , Option []    ["lib"]       (NoArg LibMode)            "compiling a library [deprecated]"
   , Option ['h'] ["help"]      (NoArg Help)               "print usage"
   , Option ['o'] ["output"]    (ReqArg OutputFile "FILE") "output FILE"
   ]
@@ -194,7 +194,7 @@ writeExports path exports =
 --------------------------------------------------------------------------------
 ----- DESERIALIZATION FOR INTERACTIVE MODES ------------------------------------
 
-fromStdin putFormattedLn = do
+fromStdinIR putFormattedLn = do
   eof <- isEOF
   if eof then exitSuccess else do
     input <- BS.getLine
@@ -212,12 +212,12 @@ fromStdin putFormattedLn = do
                      debugOut $ "decoding error" ++s
     putStrLn "" -- magic marker to be recognized by the JS runtime; 2018-03-04; aa
     hFlush stdout
-    fromStdin putFormattedLn
+    fromStdinIR putFormattedLn
   -- AA: 2018-07-15: consider timestamping these entries
   where debugOut s = appendFile "/tmp/debug" (s ++ "\n")
 
-fromStdinIR     = fromStdin (putStrLn . IR2JS.irToJSString)
-fromStdinIRJson = fromStdin (BSLazyChar8.putStrLn . IR2JS.irToJSON)
+fromStdinTextIR = fromStdinIR (putStrLn . IR2JS.irToJSString)
+fromStdinJsonIR = fromStdinIR (BSLazyChar8.putStrLn . IR2JS.irToJSON)
 
 --------------------------------------------------------------------------------
 ----- MAIN ---------------------------------------------------------------------
@@ -234,11 +234,8 @@ main = do
       putStrLn compilerUsage
       exitSuccess
 
-    ([JSONIRMode], [], []) -> fromStdinIRJson   
-
-    ([IRMode], [], []) -> do
-      fromStdinIR
-      -- hSetBuffering stdout NoBuffering
+    ([TextIRMode], [], []) -> fromStdinTextIR
+    ([JSONIRMode], [], []) -> fromStdinJsonIR
 
     (o, [file], []) | optionsOK o ->
       fromFile o file
@@ -254,7 +251,7 @@ main = do
    optionsOK :: [Flag] -> Bool
    optionsOK o | length o >=2 =
                 -- certain options must not be combined
-                not.or $ map (`elem` o) [IRMode, Help]
+                not.or $ map (`elem` o) [TextIRMode, Help]
    optionsOK _ = True
 
 

rt/src/deserialize.mts

@@ -39,7 +39,7 @@ const HEADER:string =
              this.libs.push ({lib:lib, decl:decl})} }\n"
 
 function startCompiler() {
-    __compilerOsProcess = spawn(process.env.TROUPE + '/bin/troupec', ['--json']);
+    __compilerOsProcess = spawn(process.env.TROUPE + '/bin/troupec', ['--json-ir']);
     __compilerOsProcess.on('exit', (code: number) => {
         process.exit(code);
     });