Merge remote-tracking branches 'origin/mariari/version' and 'origin/m…

…ariari/binary-fixup-no-argument-behavior'
anoma · Jul 12, 2023 · 6039a36 · 6039a36
3 parents 412f905 + 67d6d31 + 3cb8756
commit 6039a36
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/entry/entry.lisp b/src/entry/entry.lisp
@@ -9,7 +9,9 @@
      :type boolean :optional t :documentation "Use the simply typed lambda calculus frontend")
     (("output" #\o)
      :type string :optional t :documentation "Save the output to a file rather than printing")
-    (("vampir" #\v)
+    (("version" #\v)
+     :type boolean :optional t :documentation "Prints the current version of the compiler")
+    (("vampir" #\p)
      :type string :optional t :documentation "Return a vamp-ir expression")
     (("help" #\h #\?)
      :type boolean :optional t :documentation "The current help message")))
@@ -21,11 +23,18 @@
    #'argument-handlers
    :name "geb"))
 
-(defun argument-handlers (&key help stlc output input entry-point vampir)
+(defparameter *no-input-text*
+  "Please provide an input file with -p or see the help command with -h")
+
+(defun argument-handlers (&key help stlc output input entry-point vampir version)
   (flet ((run (stream)
            (cond (help
                   (command-line-arguments:show-option-help +command-line-spec+
                                                            :sort-names t))
+                 (version
+                  (format stream (asdf:system-version (asdf:find-system :geb))))
+                 ((null input)
+                  (format stream *no-input-text*))
                  (t
                   (load input)
                   (compile-down :vampir vampir

diff --git a/src/entry/package.lisp b/src/entry/package.lisp
@@ -26,26 +26,28 @@ to use
 An example use of this binary is as follows
 
 ```bash
-mariari@Gensokyo % ./geb.image -i \"foo.lisp\" -e \"geb.lambda.main::*entry*\" -l -v -o \"foo.pir\"
+mariari@Gensokyo % ./geb.image -i \"foo.lisp\" -e \"geb.lambda.main::*entry*\" -l -p -o \"foo.pir\"
 
 mariari@Gensokyo % cat foo.pir
 def entry x1 = {
   (x1)
 };%
-mariari@Gensokyo % ./geb.image -i \"foo.lisp\" -e \"geb.lambda.main::*entry*\" -l -v
+mariari@Gensokyo % ./geb.image -i \"foo.lisp\" -e \"geb.lambda.main::*entry*\" -l -p
 def *entry* x {
   0
 }
 
-./geb.image -h
+mariari@Gensokyo % ./geb.image -h
   -i --input                      string   Input geb file location
-  -e --entry-point                string   The function to run, should be fully qualified I.E.
-                                           geb::my-main
+  -e --entry-point                string   The function to run, should be fully qualified I.E. geb::my-main
   -l --stlc                       boolean  Use the simply typed lambda calculus frontend
   -o --output                     string   Save the output to a file rather than printing
-  -v --vampir                     string   Return a vamp-ir expression
+  -v --version                    boolean  Prints the current version of the compiler
+  -p --vampir                     string   Return a vamp-ir expression
   -h -? --help                    boolean  The current help message
 
+mariari@Gensokyo % ./geb.image -v
+0.3.2
 ```
 
 starting from a file *foo.lisp* that has