zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
zorba-cmd clean-up. Why this code is (mostly) duplicated here and inside libzorba isn't clear.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361

zorba-cmd clean-up. Why this code is (mostly) duplicated here and inside libzorba isn't clear.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/204361
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2013-08-09 09:04:36 +0000
+++ bin/CMakeLists.txt	2014-01-31 23:28:34 +0000
@@ -45,6 +45,7 @@
 
 SET(SRCS
   zorbacmd.cpp
+  zorbacmdproperties_base.cpp
   zorbacmdproperties.cpp
   util.cpp
   path_util.cpp

=== modified file 'bin/zorbacmdproperties.h'
--- bin/zorbacmdproperties.h	2013-06-16 00:37:21 +0000
+++ bin/zorbacmdproperties.h	2014-01-31 23:28:34 +0000
@@ -122,4 +122,5 @@
 
   bool loadProperties(int argc, char* argv[]);
 };
-#endif
+#endif /* ZORBA_CMD_PROPERTIES_H */
+/* vim:set et sw=2 ts=2: */

=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt	2013-08-09 09:04:36 +0000
+++ bin/zorbacmdproperties.txt	2014-01-31 23:28:34 +0000
@@ -1,40 +1,40 @@
-("timing,t", "Print timing information. In case of multiple queries the timing information is provided per each query. Both wallclock time and user time (which excludes I/O, network delays and other kernel waits) are shown.")
-("output-file,o", po::value<std::string>(), "Write the result to the given file.")
-("serialization-parameter,z", po::value<std::vector<std::string> >(), "Set serialization parameter in the form of a parameter=value pair (see http://www.w3.org/TR/xslt-xquery-serialization/#serparam, e.g.: -z method=xhtml -z doctype-system=DTD/xhtml1-strict.dtd -z indent=yes).")
-("serialize-html", "Serialize the result as HTML.")
-("serialize-text", "Serialize the result as Text.")
-("indent,i", "Indent output.")
-("print-query", "Print the queries.")
-("print-errors-as-xml,x", "Print the errors as XML.")
-("byte-order-mark", "Set the byte-order-mark for the serializer.")
-("omit-xml-declaration,r", "Omit the XML declaration from the result.")
+("as-files,f", "Treat all -q arguments as file paths instead of URIs or inline queries.")
 ("base-uri", po::value<std::string>(), "Set the base URI property of the static context.")
 ("boundary-space", po::value<std::string>(), "Set the boundary-space policy ('strip' or 'preserve') in the static context.")
-("default-collation", po::value<std::string>(), "Add the given collation and set the value of the default collation in the static context to the given collation.")
+("byte-order-mark", "Set the byte-order-mark for the serializer.")
+("classpath", po::value<std::string>(), "JVM classpath to be used by modules using Java implementations")
+("compile-only", "Only compile (don't execute)")
+("compile-plan,c", "Output the query plan as binary.")
 ("construction-mode", po::value<std::string>(), "Set the construction mode ('strip' or 'preserve') in the static context.")
-("ordering-mode", po::value<std::string>(), "Set the ordering mode ('ordered' or 'unordered') in the static context.")
-("multiple,m", po::value<unsigned long>()->default_value (1), "Execute the given queries multiple times.")
-("query,q", po::value<std::vector<std::string> >(&theQueriesOrFiles), "Query test or file URI (file://...)")
-("as-files,f", "Treat all -q arguments as file paths instead of URIs or inline queries.")
-("external-variable,e", po::value<std::vector<std::string> >(), "Provide the value for a variable given a file (name=file) or a value (name:=value)")
 ("context-item", po::value<std::string> (), "Set the context item to the XML document in a given file.")
-("optimization-level", po::value<std::string>()->default_value("O1"), "Optimization level for the query compiler (O0, O1 or O2 - default: O1)")
-("lib-module,l", "Query compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.")
-("parse-only", "Stop after parsing the query.")
-("compile-only", "Only compile (don't execute)")
-("no-serializer", "Do not serialize (discard) result.")
 ("debug,d", "Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.")
 ("debug-host,h", po::value<std::string>()->default_value("127.0.0.1"), "The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1")
 ("debug-port,p", po::value<unsigned int>()->default_value (28028), "The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028")
-("no-logo", "Print no logo when starting.")
-("timeout", po::value<long>()->default_value(-1), "Specify a timeout in seconds. After the specified time, the execution of the query will be aborted.")
-("uri-path", po::value<std::string>(), "URI path (list of directories) added to the built-in URI resolver, i.e. where to find modules/schemas to import.")
+("default-collation", po::value<std::string>(), "Add the given collation and set the value of the default collation in the static context to the given collation.")
+("execute-plan", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")
+("external-variable,e", po::value<std::vector<std::string> >(), "Provide the value for a variable given a file (name=file) or a value (name:=value)")
+("indent,i", "Indent output.")
+("lib-module,l", "Query compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.")
 ("lib-path", po::value<std::string>(), "Library path (list of directories) where Zorba will look for dynamic libraries (e.g., module external function implementations.")
 ("module-path", po::value<std::string>(), "Path (list of directories) to add to both the URI and Library paths.")
-("classpath", po::value<std::string>(), "JVM classpath to be used by modules using Java implementations")
+("multiple,m", po::value<unsigned long>()->default_value (1), "Execute the given queries multiple times.")
+("no-logo", "Print no logo when starting.")
+("no-serializer", "Do not serialize (discard) result.")
+("omit-xml-declaration,r", "Omit the XML declaration from the result.")
+("optimization-level", po::value<std::string>()->default_value("O1"), "Optimization level for the query compiler (O0, O1 or O2 - default: O1)")
 ("option", po::value<std::vector<std::string> >(), "Set an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://zorba.io/}option=value";).
-("trailing-nl", "Output a trailing newline after the result of the query.")
+("ordering-mode", po::value<std::string>(), "Set the ordering mode ('ordered' or 'unordered') in the static context.")
+("output-file,o", po::value<std::string>(), "Write the result to the given file.")
+("parse-only", "Stop after parsing the query.")
+("print-errors-as-xml,x", "Print the errors as XML.")
+("print-query", "Print the queries.")
+("query,q", po::value<std::vector<std::string> >(&theQueriesOrFiles), "Query test or file URI (file://...)")
+("serialization-parameter,z", po::value<std::vector<std::string> >(), "Set serialization parameter in the form of a parameter=value pair (see http://www.w3.org/TR/xslt-xquery-serialization/#serparam, e.g.: -z method=xhtml -z doctype-system=DTD/xhtml1-strict.dtd -z indent=yes).")
+("serialize-html", "Serialize the result as HTML.")
+("serialize-text", "Serialize the result as Text.")
 ("stop-words", po::value<std::vector<std::string> >(), "Mapping specifying a stop-words URI to another.")
 ("thesaurus", po::value<std::vector<std::string> >(), "Mapping specifying a thesaurus URI to another.")
-("compile-plan,c", "Output the query plan as binary.")
-("execute-plan", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")
+("timeout", po::value<long>()->default_value(-1), "Specify a timeout in seconds. After the specified time, the execution of the query will be aborted.")
+("timing,t", "Print timing information. In case of multiple queries the timing information is provided per each query. Both wallclock time and user time (which excludes I/O, network delays and other kernel waits) are shown.")
+("trailing-nl", "Output a trailing newline after the result of the query.")
+("uri-path", po::value<std::string>(), "URI path (list of directories) added to the built-in URI resolver, i.e. where to find modules/schemas to import.")

=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h	2013-08-09 09:04:36 +0000
+++ bin/zorbacmdproperties_base.h	2014-01-31 23:28:34 +0000
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* vim:set et sw=2 ts=2: */
 
 #include <string>
 #include <sstream>
@@ -23,34 +22,12 @@
 
 #ifndef ZORBACMD_ZORBACMDPROPERTIESBASE
 #define ZORBACMD_ZORBACMDPROPERTIESBASE
-namespace zorbacmd
-{
-
-class ZorbaCMDPropertiesBase : public ::zorba::PropertiesBase
-{
+namespace zorbacmd {
+
+///////////////////////////////////////////////////////////////////////////////
+
+class ZorbaCMDPropertiesBase : public ::zorba::PropertiesBase {
 protected:
-  const char** get_all_options () const
-  {
-    static const char* result [] = {
-      "--timing",
-#ifdef ZORBA_WITH_FILE_ACCESS
-      "--output-file",
-#endif /* ZORBA_WITH_FILE_ACCESS */
-      "--serialization-parameter",
-      "--serialize-html", "--serialize-text", "--indent", "--print-query",
-      "--print-errors-as-xml", "--byte-order-mark", "--omit-xml-declaration",
-      "--base-uri", "--boundary-space", "--default-collation",
-      "--construction-mode", "--ordering-mode", "--multiple", "--query",
-      "--as-files", "--external-variable", "--context-item",
-      "--optimization-level", "--lib-module", "--parse-only", "--compile-only",
-      "--no-serializer", "--debug", "--debug-host", "--debug-port", "--no-logo",
-      "--timeout", "--uri-path", "--lib-path", "--module-path", "--classpath",
-      "--option", "--trailing-nl", "--stop-words", "--thesaurus",
-      "--compile-plan", "--execute-plan", "--serialize-plan",
-      "--disable-http-resolution", NULL };
-    return result;
-  }
-
   bool theTiming;
 #ifdef ZORBA_WITH_FILE_ACCESS
   std::string theOutputFile;
@@ -98,444 +75,68 @@
   bool theQBeforeF;
   bool theUnknownOption;
 
-  void initialize () 
-  {
-    theTiming = false;
-    theSerializeHtml = false;
-    theSerializeText = false;
-    theIndent = false;
-    thePrintQuery = false;
-    thePrintErrorsAsXml = false;
-    theByteOrderMark = false;
-    theOmitXmlDeclaration = false;
-    theMultiple = 1;
-    theAsFiles = true;
-    theOptimizationLevel = "O1";
-    theLibModule = false;
-    theParseOnly = false;
-    theCompileOnly = false;
-    theNoSerializer = false;
-    theDebug = false;
-    theDebugHost = "127.0.0.1";
-    theDebugPort = 28028;
-    theNoLogo = false;
-    theTimeout = -1;
-    theTrailingNl = false;
-    theSerializePlan = false;
-    theSavePlan = false;
-    theLoadPlan = false;
-    theFparm = false;
-    theQBeforeF = false;
-    theUnknownOption = false;
-  }
+  // inherited
+  const char** get_all_options() const;
 
 public:
-  const bool &timing () const { return theTiming; }
+  ZorbaCMDPropertiesBase();
+
+  bool timing () const { return theTiming; }
 #ifdef ZORBA_WITH_FILE_ACCESS
   const std::string &outputFile () const { return theOutputFile; }
 #endif /* ZORBA_WITH_FILE_ACCESS */
   const std::vector<std::string> &serializationParameter () const { return theSerializationParameter; }
-  const bool &serializeHtml () const { return theSerializeHtml; }
-  const bool &serializeText () const { return theSerializeText; }
-  const bool &indent () const { return theIndent; }
-  const bool &printQuery () const { return thePrintQuery; }
-  const bool &printErrorsAsXml () const { return thePrintErrorsAsXml; }
-  const bool &byteOrderMark () const { return theByteOrderMark; }
-  const bool &omitXmlDeclaration () const { return theOmitXmlDeclaration; }
+  bool serializeHtml () const { return theSerializeHtml; }
+  bool serializeText () const { return theSerializeText; }
+  bool indent () const { return theIndent; }
+  bool printQuery () const { return thePrintQuery; }
+  bool printErrorsAsXml () const { return thePrintErrorsAsXml; }
+  bool byteOrderMark () const { return theByteOrderMark; }
+  bool omitXmlDeclaration () const { return theOmitXmlDeclaration; }
   const std::string &baseUri () const { return theBaseUri; }
   const std::string &boundarySpace () const { return theBoundarySpace; }
   const std::string &defaultCollation () const { return theDefaultCollation; }
   const std::string &constructionMode () const { return theConstructionMode; }
   const std::string &orderingMode () const { return theOrderingMode; }
-  const unsigned long &multiple () const { return theMultiple; }
+  unsigned long multiple () const { return theMultiple; }
   const std::vector<std::string> &query () const { return theQueriesOrFiles; }
-  const bool &asFiles () const { return theAsFiles; }
+  bool asFiles () const { return theAsFiles; }
   const std::vector<std::string> &externalVariable () const { return theExternalVariable; }
   const std::string &contextItem () const { return theContextItem; }
   const std::string &optimizationLevel () const { return theOptimizationLevel; }
-  const bool &libModule () const { return theLibModule; }
-  const bool &parseOnly () const { return theParseOnly; }
-  const bool &compileOnly () const { return theCompileOnly; }
-  const bool &noSerializer () const { return theNoSerializer; }
-  const bool &debug () const { return theDebug; }
+  bool libModule () const { return theLibModule; }
+  bool parseOnly () const { return theParseOnly; }
+  bool compileOnly () const { return theCompileOnly; }
+  bool noSerializer () const { return theNoSerializer; }
+  bool debug () const { return theDebug; }
   const std::string &debugHost () const { return theDebugHost; }
-  const unsigned int &debugPort () const { return theDebugPort; }
-  const bool &noLogo () const { return theNoLogo; }
+  unsigned debugPort () const { return theDebugPort; }
+  bool noLogo () const { return theNoLogo; }
   const long &timeout () const { return theTimeout; }
   const std::string &uriPath () const { return theUriPath; }
   const std::string &libPath () const { return theLibPath; }
   const std::string &modulePath () const { return theModulePath; }
   const std::string &classpath () const { return theClasspath; }
   const std::vector<std::string> &option () const { return theOption; }
-  const bool &trailingNl () const { return theTrailingNl; }
+  bool trailingNl () const { return theTrailingNl; }
   const std::vector<std::string> &stopWords () const { return theStopWords; }
   const std::vector<std::string> &thesaurus () const { return theThesaurus; }
-  const bool& serializePlan () const { return theSerializePlan; }
-  const bool& loadPlan () const { return theLoadPlan; }
-  const bool& savePlan () const { return theSavePlan; }
-  const bool& qBeforeF () const { return theQBeforeF; }
-  const bool& unknownOption() const { return theUnknownOption; }
-
-  std::string load_argv (int argc, const char **argv) 
-  {
-    if (argv == NULL) return "";
-
-    std::string result;
-    for (++argv; *argv != NULL; ++argv) 
-    {
-      if (strcmp (*argv, "--help") == 0 || strcmp (*argv, "-h") == 0)
-        return "!HELP";
-
-      else if (strcmp (*argv, "--version") == 0)
-        return "!VER";
-
-      else if (strcmp (*argv, "--timing") == 0 || strncmp (*argv, "-t", 2) == 0) 
-      {
-        theTiming = true;
-      }
-#ifdef ZORBA_WITH_FILE_ACCESS
-      else if (strcmp (*argv, "--output-file") == 0 || strncmp (*argv, "-o", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --output-file option"; break; }
-        init_val (*argv, theOutputFile, d);
-      }
-#endif /* ZORBA_WITH_FILE_ACCESS */
-      else if (strcmp (*argv, "--serialization-parameter") == 0 || strncmp (*argv, "-z", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --serialization-parameter option"; break; }
-
-        init_val (*argv, theSerializationParameter, d);
-      }
-      else if (strcmp (*argv, "--serialize-html") == 0) 
-      {
-        theSerializeHtml = true;
-      }
-      else if (strcmp (*argv, "--serialize-text") == 0) 
-      {
-        theSerializeText = true;
-      }
-      else if (strcmp (*argv, "--indent") == 0 || strncmp (*argv, "-i", 2) == 0) 
-      {
-        theIndent = true;
-      }
-      else if (strcmp (*argv, "--print-query") == 0) 
-      {
-        thePrintQuery = true;
-      }
-      else if (strcmp (*argv, "--print-errors-as-xml") == 0 || strncmp (*argv, "-x", 2) == 0)
-      {
-        thePrintErrorsAsXml = true;
-      }
-      else if (strcmp (*argv, "--byte-order-mark") == 0) 
-      {
-        theByteOrderMark = true;
-      }
-      else if (strcmp (*argv, "--omit-xml-declaration") == 0 || strncmp (*argv, "-r", 2) == 0) 
-      {
-        theOmitXmlDeclaration = true;
-      }
-      else if (strcmp (*argv, "--base-uri") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --base-uri option"; break; }
-        init_val (*argv, theBaseUri, d);
-      }
-      else if (strcmp (*argv, "--boundary-space") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --boundary-space option"; break; }
-        init_val (*argv, theBoundarySpace, d);
-      }
-      else if (strcmp (*argv, "--default-collation") == 0)
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --default-collation option"; break; }
-        init_val (*argv, theDefaultCollation, d);
-      }
-      else if (strcmp (*argv, "--construction-mode") == 0)
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --construction-mode option"; break; }
-
-        init_val (*argv, theConstructionMode, d);
-      }
-      else if (strcmp (*argv, "--ordering-mode") == 0) {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --ordering-mode option"; break; }
-
-        init_val (*argv, theOrderingMode, d);
-      }
-      else if (strcmp (*argv, "--multiple") == 0 || strncmp (*argv, "-m", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL)
-        {
-          result = "No value given for --multiple option"; break;
-        }
-        init_val(*argv, theMultiple, d);
-      }
-      else if (strcmp (*argv, "--query") == 0 || strncmp (*argv, "-q", 2) == 0) 
-      {
-        int d = 2;
-        if(theFparm == false)
-          theAsFiles = false;
-        if(*(argv+1) && !strncmp(*(argv+1), "-f", 2))
-        {
-          theQBeforeF = true; // is it "-q -f <filename>" perhaps?
-          break;           // stop functionality here
-        }
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL)
-        {
-          result = "No value given for --query option"; break;
-        }
-        init_val (*argv, theQueriesOrFiles, d);
-      }
-      else if (strcmp (*argv, "--as-files") == 0 || strncmp (*argv, "-f", 2) == 0) 
-      {
-        theFparm = true;
-        theAsFiles = true;
-      }
-      else if (strcmp (*argv, "--external-variable") == 0 || strncmp (*argv, "-e", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) 
-        {
-          result = "No value given for --external-variable option"; break;
-        }
-        init_val(*argv, theExternalVariable, d);
-      }
-      else if (strcmp (*argv, "--context-item") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) 
-        {
-          result = "No value given for --context-item option"; break;
-        }
-        init_val (*argv, theContextItem, d);
-      }
-      else if (strcmp (*argv, "--optimization-level") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL)
-        {
-          result = "No value given for --optimization-level option"; break;
-        }
-        init_val(*argv, theOptimizationLevel, d);
-      }
-      else if (strcmp (*argv, "--lib-module") == 0 || strncmp (*argv, "-l", 2) == 0) 
-      {
-        theLibModule = true;
-      }
-      else if (strcmp (*argv, "--parse-only") == 0) 
-      {
-        theParseOnly = true;
-      }
-      else if (strcmp (*argv, "--compile-only") == 0) 
-      {
-        theCompileOnly = true;
-      }
-      else if (strcmp (*argv, "--no-serializer") == 0) 
-      {
-        theNoSerializer = true;
-      }
-      else if (strcmp (*argv, "--debug") == 0 || strncmp (*argv, "-d", 2) == 0) 
-      {
-        theDebug = true;
-      }
-      else if (strcmp (*argv, "--debug-host") == 0 || strncmp (*argv, "-h", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) 
-        {
-          result = "No value given for --debug-host option"; break;
-        }
-        init_val (*argv, theDebugHost, d);
-      }
-      else if (strcmp (*argv, "--debug-port") == 0 || strncmp (*argv, "-p", 2) == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) 
-        {
-          result = "No value given for --debug-port option"; break;
-        }
-        init_val (*argv, theDebugPort, d);
-      }
-      else if (strcmp (*argv, "--no-logo") == 0) 
-      {
-        theNoLogo = true;
-      }
-      else if (strcmp (*argv, "--timeout") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --timeout option"; break; }
-        init_val (*argv, theTimeout, d);
-      }
-      else if (strcmp (*argv, "--uri-path") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --uri-path option"; break; }
-        init_val (*argv, theUriPath, d);
-      }
-      else if (strcmp (*argv, "--lib-path") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --lib-path option"; break; }
-        init_val (*argv, theLibPath, d);
-      }
-      else if (strcmp (*argv, "--module-path") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --module-path option"; break; }
-        init_val (*argv, theModulePath, d);
-      }
-      else if (strcmp (*argv, "--classpath") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --classpath option"; break; }
-
-        init_val (*argv, theClasspath, d);
-      }
-      else if (strcmp (*argv, "--option") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --option option"; break; }
-        init_val (*argv, theOption, d);
-      }
-      else if (strcmp (*argv, "--trailing-nl") == 0) 
-      {
-        theTrailingNl = true;
-      }
-      else if (strcmp (*argv, "--stop-words") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --stop-words option"; break; }
-        init_val (*argv, theStopWords, d);
-      }
-      else if (strcmp (*argv, "--thesaurus") == 0) 
-      {
-        int d = 2;
-        if ((*argv) [1] == '-' || (*argv) [2] == '\0') { d = 0; ++argv; }
-        if (*argv == NULL) { result = "No value given for --thesaurus option"; break; }
-        init_val (*argv, theThesaurus, d);
-      }
-      else if (strcmp (*argv, "--serialize-plan") == 0 || strncmp (*argv, "-s", 2) == 0)
-      {
-        theSerializePlan = true;
-      }
-      else if (strcmp (*argv, "--compile-plan") == 0)
-      {
-        theSavePlan = true;
-      }
-      else if (strcmp (*argv, "--execute-plan") == 0)
-      {
-        theLoadPlan = true;
-      }
-      else if (strcmp (*argv, "--disable-http-resolution") == 0)
-      {
-        init_val ("{http://zorba.io/options/features}disable=http-uri-resolution";,
-                  theOption, 0);
-      }
-      else if (strcmp (*argv, "--") == 0)
-      {
-        copy_args (++argv);
-        break;
-      }
-      else if ((*argv) [0] == '-')
-      {
-        result = "unknown command line option "; result += *argv; 
-        theUnknownOption = true; break; 
-      }
-      else
-      {
-        init_val(*argv, theQueriesOrFiles, 0);
-        copy_args (argv);
-      }
-    }
-
-    return result;
-  }
-
-  const char *get_help_msg () const 
-  {
-    return
-        "--timing, -t\nPrint timing information. In case of multiple queries the timing information is provided per each query. Both wallclock time and user time (which excludes I/O, network delays and other kernel waits) are shown.\n\n"
-        "--output-file, -o\nWrite the result to the given file.\n\n"
-        "--serialization-parameter, -z\nSet serialization parameter in the form of a parameter=value pair (see http://www.w3.org/TR/xslt-xquery-serialization/#serparam, e.g.: -z method=xhtml -z doctype-system=DTD/xhtml1-strict.dtd -z indent=yes).\n\n"
-        "--serialize-html\nSerialize the result as HTML.\n\n"
-        "--serialize-text\nSerialize the result as Text.\n\n"
-        "--indent, -i\nIndent output.\n\n"
-        "--print-query\nPrint the queries.\n\n"
-        "--print-errors-as-xml, -x\nPrint the errors as XML.\n\n"
-        "--byte-order-mark\nSet the byte-order-mark for the serializer.\n\n"
-        "--omit-xml-declaration, -r\nOmit the XML declaration from the result.\n\n"
-        "--base-uri\nSet the base URI property of the static context.\n\n"
-        "--boundary-space\nSet the boundary-space policy ('strip' or 'preserve') in the static context.\n\n"
-        "--default-collation\nAdd the given collation and set the value of the default collation in the static context to the given collation.\n\n"
-        "--construction-mode\nSet the construction mode ('strip' or 'preserve') in the static context.\n\n"
-        "--ordering-mode\nSet the ordering mode ('ordered' or 'unordered') in the static context.\n\n"
-        "--multiple, -m\nExecute the given queries multiple times.\n\n"
-        "--query, -q\nQuery test or file URI (file://...)\n\n"
-        "--as-files, -f\nTreat all -q arguments as file paths instead of URIs or inline queries. This option is deprecated and will be defaulted to true in the future, so any entry in the command line is going to be treated as files.\n\n"
-        "--external-variable, -e\nProvide the value for a variable given a file (name=file) or a value (name:=value)\n\n"
-        "--context-item\nSet the context item to the XML document in a given file.\n\n"
-        "--optimization-level\nOptimization level for the query compiler (O0, O1 or O2 - default: O1)\n\n"
-        "--lib-module, -l\nQuery compiler option to treat the query as a library module. If this is set --compile-only option is also set to true.\n\n"
-        "--parse-only\nStop after parsing the query.\n\n"
-        "--compile-only\nOnly compile (don't execute)\n\n"
-        "--no-serializer\nDo not serialize (discard) result.\n\n"
-        "--debug, -d\nLaunch the Zorba debugger server and connect to a DBGP-enabled debugger client.\n\n"
-        "--debug-host, -h\nThe host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n"
-        "--debug-port, -p\nThe port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028\n\n"
-        "--no-logo\nPrint no logo when starting.\n\n"
-        "--timeout\nSpecify a timeout in seconds. After the specified time, the execution of the query will be aborted.\n\n"
-        "--uri-path\nURI path (list of directories) added to the built-in URI resolver, i.e. where to find modules/schemas to import.\n\n"
-        "--lib-path\nLibrary path (list of directories) where Zorba will look for dynamic libraries (e.g., module external function implementations.\n\n"
-        "--module-path\nPath (list of directories) to add to both the URI and Library paths.\n\n"
-        "--classpath\nJVM classpath to be used by modules using Java implementations\n\n"
-        "--option\nSet an XQuery option in the static context. The QName of the option is passed as a string in the notation by James Clark (i.e. {namespace}localname). For example, --option {http://zorba.io/}option=value\n\n";
-        "--trailing-nl\nOutput a trailing newline after the result of the query.\n\n"
-        "--stop-words\nMapping specifying a stop-words URI to another.\n\n"
-        "--thesaurus\nMapping specifying a thesaurus URI to another.\n\n"
-        "--serialize-plan, -s\nSerialize and then load the query execution plan.\n\n"
-        "--compile-plan,\nDo not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n"
-        "--execute-plan\nDo not compile the query; instead load the execution plan from the file specified by the -f -q options (or by any file specified without any other argument), and execute the loaded plan.\n\n"
-        "--disable-http-resolution\nDo not use HTTP to resolve URIs\n\n"
-        ;
-  }
-
-  static const ZorbaCMDPropertiesBase *instance () 
-  {
-    static ZorbaCMDPropertiesBase result;
-    return &result;
-  }
-
-  ZorbaCMDPropertiesBase () { initialize (); }
-  
+  bool serializePlan () const { return theSerializePlan; }
+  bool loadPlan () const { return theLoadPlan; }
+  bool savePlan () const { return theSavePlan; }
+  bool qBeforeF () const { return theQBeforeF; }
+  bool unknownOption() const { return theUnknownOption; }
+
+  std::string load_argv(int argc, const char **argv);
+
+  const char* get_help_msg() const;
+
+  static const ZorbaCMDPropertiesBase* instance();
 };
 
-}   // namespaces
-
-#endif // ZORBACMD_ZORBACMDPROPERTIESBASE
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace zorbacmd
+
+#endif /* ZORBACMD_ZORBACMDPROPERTIESBASE */
+/* vim:set et sw=2 ts=2: */