Merge remote-tracking branch 'origin/artem/std-lib-print' into artem/…

…test-flag

src/entry/entry.lisp

@@ -13,6 +13,8 @@
      :type boolean :optional t :documentation "Prints the current version of the compiler")
     (("vampir" #\p)
      :type string :optional t :documentation "Return a vamp-ir expression")
+    (("library" #\s)
+     :type boolean :optional t :documentation "Prints standard library")
     (("test" #\t)
      :type boolean :optional t :documentation "Prints a test equality with public parameters")
     (("help" #\h #\?)
@@ -28,7 +30,7 @@
 (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 test version)
+(defun argument-handlers (&key help stlc output input entry-point vampir library test version)
   (flet ((run (stream)
            (cond (help
                   (command-line-arguments:show-option-help +command-line-spec+
@@ -41,6 +43,7 @@
                   (load input)
                   (compile-down :vampir vampir
                                 :stlc stlc
+                                :library library
                                 :entry entry-point
                                 :test test
                                 :stream stream)))))
@@ -52,17 +55,27 @@
         (run *standard-output*))))
 
 ;; this code is very bad please abstract out many of the components
-(defun compile-down (&key vampir stlc entry test (stream *standard-output*))
-  (let* ((name        (read-from-string entry))
-         (eval        (eval name))
-         (vampir-name (renaming-scheme (intern (symbol-name name) 'keyword))))
-    (cond ((and vampir stlc test)
+(defun compile-down (&key vampir stlc entry library test (stream *standard-output*))
+  (let* ((name         (read-from-string entry))
+         (eval         (eval name))
+         (vampir-name  (renaming-scheme (intern (symbol-name name) 'keyword))))
+    (cond ((and vampir stlc library test)
            (let ((circuit (to-circuit eval vampir-name)))
-             (geb.vampir:extract (append circuit
-                                         (geb.seqn.trans:test-call
-                                          (car circuit)))
-                                 stream)
+             (geb.vampir:extract
+              (append geb.vampir::*standard-library*
+                      circuit (geb.seqn.trans:test-call (car circuit)))
+              stream)
+             (format stream ";")))
+          ((and vampir stlc test)
+           (let ((circuit (to-circuit eval vampir-name)))
+             (geb.vampir:extract
+              (append circuit (geb.seqn.trans:test-call (car circuit)))
+              stream)
              (format stream ";")))
+          ((and vampir stlc library)
+           (geb.vampir:extract
+            (append geb.vampir::*standard-library*
+                    (to-circuit eval vampir-name))))
           ((and vampir stlc)
            (geb.vampir:extract (to-circuit eval vampir-name) stream))
           ((and vampir test)
@@ -74,8 +87,14 @@
              (format stream ";")))
           (stlc
            (format stream "~A" (to-cat nil eval)))
+          ((and vampir library)
+           (geb.vampir:extract
+            (append geb.vampir::*standard-library*
+                    (to-circuit eval vampir-name))))
           (vampir
            (geb.vampir:extract (to-circuit eval vampir-name) stream))
+          (library
+           (geb.vampir:extract geb.vampir::*standard-library*))
           (t
            (format stream eval)))))
 

src/entry/package.lisp

@@ -45,6 +45,7 @@ mariari@Gensokyo % ./geb.image -h
   -o --output                     string   Save the output to a file rather than printing
   -v --version                    boolean  Prints the current version of the compiler
   -p --vampir                     string   Return a vamp-ir expression
+  -s --library                    boolean  Print standard library
   -h -? --help                    boolean  The current help message
 
 mariari@Gensokyo % ./geb.image -v
@@ -84,6 +85,10 @@ the -l flag means that we are not expecting a geb term, but rather a
 lambda frontend term, this is to simply notify us to compile it as a
 lambda term rather than a geb term. In time this will go away
 
+The flag -s prints the standard library the compiler uses. If -p is
+used alongside it, the standard library gets printed before the
+compiled circuit.
+
 The flag -t after -p signals that the user wants to make an
 automatically generated test equality. Given a compiled VampIR
 function with name foo and arguments x1...xn prints an equality as