Update schema generation to output schema for all levels, and for make

minsky.xsd to output level 2 schema.
highperformancecoder · Nov 2, 2017 · fc37466 · fc37466
1 parent 7252621
commit fc37466
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -206,7 +206,7 @@ mac-dist: gui-tk/minsky
 	sh -v mkMacDist.sh
 
 minsky.xsd: gui-tk/minsky
-	gui-tk/minsky exportSchema.tcl
+	gui-tk/minsky exportSchema.tcl 2
 
 upload-schema: minsky.xsd
 	scp minsky.xsd $(SF_WEB)

diff --git a/exportSchema.tcl b/exportSchema.tcl
@@ -1,3 +1,3 @@
 #!minsky
-minsky.exportSchema minsky.xsd
+minsky.exportSchema minsky.xsd $argv(2)
 tcl_exit
diff --git a/gui-tk/minskyTCL.h b/gui-tk/minskyTCL.h
@@ -246,12 +246,6 @@ namespace minsky
       rebuildTCLcommands=true;
     }
 
-    void exportSchema(TCL_args args) {
-      const char* filename=args;
-      int schemaLevel=1;
-      if (args.count) schemaLevel=args;
-      Minsky::exportSchema(filename, schemaLevel);
-    }
     void latex(const char* filename, bool wrapLaTeXLines);
 
     void matlab(const char* filename) {

diff --git a/model/minsky.cc b/model/minsky.cc
@@ -807,7 +807,18 @@ namespace minsky
   {
     xsd_generate_t x;
     // currently, there is only 1 schema level, so ignore second arg
-    xsd_generate(x,"Minsky",schema1::Minsky());
+    switch (schemaLevel)
+      {
+      case 0:
+        xsd_generate(x,"Minsky",schema0::Minsky());
+        break;
+      case 1:
+        xsd_generate(x,"Minsky",schema1::Minsky());
+        break;
+      case 2:
+        xsd_generate(x,"Minsky",schema2::Minsky());
+        break;
+      }
     ofstream f(filename);
     x.output(f,schemaURL);
   }

diff --git a/schema/schema2.h b/schema/schema2.h
@@ -275,6 +275,19 @@ namespace schema2
 
 namespace classdesc
 {
+
+#ifdef _CLASSDESC
+#pragma omit xsd_generate schema2::Optional
+#pragma omit xml_pack schema2::Optional
+#endif
+
+  template <class T>
+  void xsd_generate(xsd_generate_t& g, const string& d, const schema2::Optional<T>& a) 
+  {
+    xsd_generate_t::Optional o(g,true); 
+    xsd_generate(g,d,*a);
+  }
+
   template <class T> void xpack(xml_pack_t& t,const string& d,T& a) 
   {if (a) ::xml_pack(t,d,*a);}
 
@@ -297,6 +310,11 @@ namespace classdesc
                        std::shared_ptr<ecolab::Plot::Side>& a) {xpack(t,d,a);}
 }
 
+//template <class T>
+//void xml_pack(classdesc::xml_pack_t& t, const classdesc::string& d, const schema2::Optional<T>& a) 
+//{if (a) ::xml_pack(t,d,*a);}
+
+using classdesc::xsd_generate;
 using classdesc::xml_pack;
 
 #include "schema2.cd"