Work in progress

gpoblon · Nov 16, 2020 · 3a745de · 3a745de
1 parent 8a5beba
commit 3a745de
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/rudder-lang/src/generator/cfengine/syntax.rs b/rudder-lang/src/generator/cfengine/syntax.rs
@@ -643,7 +643,7 @@ mod tests {
                     .condition("debian".to_string())
                     .build()).to_string()
             ,
-            "bundle agent test {\n\n  methods:\n    # component:\n    # \n    #   \n    # \n    \"component_${report_data.directive_id}_0\" usebundle => _method_reporting_context(\"component\", \"parameter\"),\n                                             if => concat(\"debian\");\n    \"component_${report_data.directive_id}_0\" usebundle => package_present(vim),\n                                             if => concat(\"debian\");\n    \"component_${report_data.directive_id}_0\" usebundle => _classes_noop(canonify(\"${class_prefix}_package_present_parameter\")),\n                                         unless => concat(\"debian\");\n    \"component_${report_data.directive_id}_0\" usebundle => log_rudder(\"Skipping method \'component\' with key parameter \'parameter\' since condition \'debian\' is not reached\", \"parameter\", canonify(\"${class_prefix}_package_present_parameter\"), canonify(\"${class_prefix}_package_present_parameter\"), @{args}),\n                                         unless => concat(\"debian\");\n\n}"
+            "bundle agent test {\n\n  methods:\n    # component:\n    # \n    #   \n    # \n    \"component_${report_data.directive_id}_0\" usebundle => _method_reporting_context(\"component\", \"parameter\");\n    \"component_${report_data.directive_id}_0\" usebundle => log_na_rudder(\"\'component\' method is not available on classic Rudder agent, skip\", \"parameter\", \"${class_prefix}_package_present_parameter\", @{args});\n\n}"
         );
     }
 

diff --git a/rudder-lang/src/ir/ir1.rs b/rudder-lang/src/ir/ir1.rs
@@ -206,8 +206,23 @@ impl<'src> IR1<'src> {
         //     } = variable;
         //     state_params
         //         .iter()
-        //         .map(|arg| Value::from_pvalue(&self.enum_list, context, arg))
-        //         .collect() // TODO TODODODODODODODO
+        //         .map(|arg| {
+        //             ComplexValue::from_pcomplex_value(
+        //                 &self.enum_list,
+        //                 context,
+        //                 PComplexValue {
+        //                     source: name,
+        //                     cases: vec![(
+        //                         PEnumExpression {
+        //                             source: "".into(),
+        //                             expression: PEnumExpressionPart::Default("".into()),
+        //                         },
+        //                         Some(arg),
+        //                     )],
+        //                 },
+        //             )
+        //         })
+        //         .collect() // TODO
         // }
     }
 
@@ -400,7 +415,7 @@ mod tests {
         let mut source = source.clone();
         source.push_str(append);
         let res = parse_str(name, &source);
-        assert!(res.is_err(), "OK instead of Error {:?}", res);
+        assert!(res.is_err(), "OK instead of Error {:#?}", res);
     }
 
     fn parse_str<'src>(name: &'src str, source: &'src str) -> Result<IR1<'src>> {

diff --git a/rudder-lang/src/parser.rs b/rudder-lang/src/parser.rs
@@ -496,10 +496,6 @@ fn pinteger(i: PInput) -> PResult<(Token, i64)> {
 fn plist(i: PInput) -> PResult<Vec<PValue>> {
     wsequence!(
         {
-            // s: tag("[");
-            // values: separated_list(sp(etag(",")), pvalue);
-            // _x: or_fail(peek(is_not(",")), || PErrorKind::ExpectedToken("parameter"));
-            // _x: or_fail(tag("]"),|| PErrorKind::UnterminatedDelimiter(s));
             values: delimited_list("[", pvalue, ",", "]");
         } => values
     )(i)