Work in progress

rudder-lang/Makefile

@@ -68,7 +68,7 @@ libs:
 libs-docs: libs
 	mkdir -p target/docs/std
 	# FIXME replace with proper option
-	cargo run -- -l info -c tools/rudderc-dev.conf -n simplest/technique.rl -f md
+	cargo run -- compile -c tools/rudderc-dev.conf -i simplest/technique.rl -f md
 	echo "" > target/docs/std/lib.adoc
 	for resource in $$(ls -1 target/docs/std/*.md); \
 	  do pandoc -t asciidoc -f commonmark $${resource} >> target/docs/std/lib.adoc; \

rudder-lang/src/io.rs

@@ -226,7 +226,7 @@ fn get_output_format(
 
     // All formats but Compile are hardcoded in CLI implementation, so this is partly double check
     match (command, format) {
-        (Command::Compile, Some(fmt)) if fmt == Format::CFEngine || fmt == Format::DSC => {
+        (Command::Compile, Some(fmt)) if fmt == Format::CFEngine || fmt == Format::DSC || fmt == Format::Markdown => {
             Ok((format!("{}.{}", "rl", fmt), fmt))
         }
         (Command::Compile, _) => {

rudder-lang/src/io/cli_parser.rs

@@ -60,7 +60,7 @@ pub enum CLI {
         json_logs: bool,
 
         /// Enforce a compiler output format (overrides configuration format)
-        #[structopt(long, short, possible_values = &["cf", "cfengine", "dsc"])]
+        #[structopt(long, short)]
         format: Option<Format>,
     },
 }

rudder-lang/tools/generate_lib

@@ -132,7 +132,7 @@ def parse_method_metadata(content):
                         'name': param_name, 'description': match.group(4)}
                     param_names.add(param_name)
                 if tag == "parameter_constraint":
-                    constraint = json.loads("{" + match.group(4) + "}")
+                    constraint = json.loads("{" + match.group(4).replace('\\', '\\\\') + "}")
                     # extend default_constraint if it was not already defined)
                     param_constraints.setdefault(
                         match.group(3), default_constraint.copy()).update(constraint)