Merge branch 'rework-schema-import-and-lookup'

[cl-protobufs.git] / printer.lisp

diff --git a/printer.lisp b/printer.lisp
index 24578bb7cfe8c83425a1d3f65dd74bd57f3846aa..99354131fed0c07b3675d7ba2ab8fac58d18593f 100644 (file)
--- a/printer.lisp
+++ b/printer.lisp
@@ -79,35 +79,35 @@
               (and (not (zerop indentation)) indentation) line))))
 
 ;; Lisp was born in 1958 :-)
-(defvar *lisp-options* '(("lisp_package" string 195801)
-                         ("lisp_name"    string 195802)
-                         ("lisp_alias"   string 195803)
-                         ("lisp_type"    string 195804)
-                         ("lisp_class"   string 195805)
-                         ("lisp_slot"    string 195806)))
-
-(defvar *option-types* '(("ctype"                 symbol)
-                         ("deadline"               float)
-                         ("deprecated"            symbol)
-                         ("optimize_for"          symbol)
-                         ("packed"               boolean)
-                         ("protocol"              symbol)
-                         ("stream_type"           string)
-                         ;; Keep the rest of these in alphabetical order
-                         ("cc_api_version"       integer)
-                         ("cc_generic_services"   symbol)
-                         ("go_api_version"       integer)
-                         ("go_generic_services"   symbol)
-                         ("go_package"            string)
-                         ("java_api_version"     integer)
-                         ("java_generic_services" symbol)
-                         ("java_java5_enums"     boolean)
-                         ("java_multiple_files"  boolean)
-                         ("java_outer_classname"  string)
-                         ("java_package"          string)
-                         ("java_use_javaproto2"  boolean)
-                         ("py_api_version"       integer)
-                         ("py_generic_services"   symbol)))
+(defparameter *lisp-options* '(("lisp_package" string 195801)
+                               ("lisp_name"    string 195802)
+                               ("lisp_alias"   string 195803)
+                               ("lisp_type"    string 195804)
+                               ("lisp_class"   string 195805)
+                               ("lisp_slot"    string 195806)))
+
+(defparameter *option-types* '(("ctype"                 symbol)
+                               ("deadline"               float)
+                               ("deprecated"            symbol)
+                               ("optimize_for"          symbol)
+                               ("packed"               boolean)
+                               ("protocol"              symbol)
+                               ("stream_type"           string)
+                               ;; Keep the rest of these in alphabetical order
+                               ("cc_api_version"       integer)
+                               ("cc_generic_services"   symbol)
+                               ("go_api_version"       integer)
+                               ("go_generic_services"   symbol)
+                               ("go_package"            string)
+                               ("java_api_version"     integer)
+                               ("java_generic_services" symbol)
+                               ("java_java5_enums"     boolean)
+                               ("java_multiple_files"  boolean)
+                               ("java_outer_classname"  string)
+                               ("java_package"          string)
+                               ("java_use_javaproto2"  boolean)
+                               ("py_api_version"       integer)
+                               ("py_generic_services"   symbol)))
 
 (defmethod write-schema-header ((type (eql :proto)) (schema protobuf-schema) stream)
   (when (any-lisp-option schema)