Merge pull request #21 from urbanopt/refactor/mbl-misc-updates

Refactor/mbl misc updates

examples/functions-out.mo

@@ -0,0 +1,23 @@
+within Somewhere;
+class MyClass
+  "Class to demo function definitions"
+  extends Modelica.Icons.BasesPackage;
+  function constructor
+    "Construct to connect to a schedule in EnergyPlus"
+    extends Modelica.Icons.Function;
+    input Integer input1
+      "input 1 comment";
+    output MyClass adapter;
+  external "C" adapter=ExternalFunctionCall(
+    param1,
+    param2,
+    param3);
+  end constructor;
+  function destructor
+    "Some comment"
+    extends Modelica.Icons.Function;
+    input Integer input2;
+  external "C" EnergyPlusInputVariableFree(
+    input2);
+  end destructor;
+end MyClass;

examples/functions.mo

@@ -0,0 +1,21 @@
+within Somewhere;
+class MyClass
+  "Class to demo function definitions"
+  extends Modelica.Icons.BasesPackage;
+
+  function constructor
+    "Construct to connect to a schedule in EnergyPlus"
+    extends Modelica.Icons.Function;
+
+    input Integer input1 "input 1 comment";
+    output MyClass adapter;
+    external "C" adapter = ExternalFunctionCall(param1, param2, param3);
+  end constructor;
+
+  function destructor "Some comment"
+    extends Modelica.Icons.Function;
+
+    input Integer input2;
+    external "C" EnergyPlusInputVariableFree(input2);
+  end destructor;
+end MyClass;

examples/gmt-building-out.mo

@@ -185,6 +185,35 @@ February 21, 2020, by Antoine Gautier:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100,-100},{100,100}},
+          radius=25.0),
+        Polygon(
+          points={{0,76},{-80,-64},{80,-64},{0,76}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Polygon(
+          points={{0,68},{-72,-60},{72,-60},{0,68}},
+          lineColor={0,0,0},
+          fillColor={255,255,170},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-6,-36},{4,-46}},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-4,34},{2,-28}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None)}));
 end building;
 /* trailing comment */

examples/gmt-building.mo

@@ -220,6 +220,7 @@ February 21, 2020, by Antoine Gautier:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),Icon(
+  graphics={Rectangle(lineColor={200,200,200},fillColor={248,248,248},fillPattern=FillPattern.HorizontalCylinder,extent={{-100,-100},{100,100}},radius=25.0),Polygon(points={{0,76},{-80,-64},{80,-64},{0,76}},fillColor={0,0,0},fillPattern=FillPattern.Solid,pattern=LinePattern.None,lineColor={0,0,0}),Polygon(points={{0,68},{-72,-60},{72,-60},{0,68}},lineColor={0,0,0},fillColor={255,255,170},fillPattern=FillPattern.Solid),Ellipse(extent={{-6,-36},{4,-46}},pattern=LinePattern.None,fillColor={0,0,0},fillPattern=FillPattern.Solid),Rectangle(extent={{-4,34},{2,-28}},fillColor={0,0,0},fillPattern=FillPattern.Solid,pattern=LinePattern.None)}));
 end building;
 /* trailing comment */

main.go

@@ -77,6 +77,7 @@ func main() {
 	}
 	if flag.NArg() == 0 {
 		fmt.Fprintln(os.Stderr, "error: must provide at least one file or directory")
+		usage()
 		os.Exit(2)
 	}
 

modelicafmt.go

@@ -30,7 +30,8 @@ func (l *modelicaListener) insertIndentBefore(rule antlr.ParserRuleContext) bool
 		parser.IExpression_listContext,
 		parser.IConstraining_clauseContext,
 		parser.IIf_expressionContext,
-		parser.IIf_expression_bodyContext:
+		parser.IIf_expression_bodyContext,
+		parser.IExternal_function_call_argumentContext:
 		return true
 	case parser.IString_commentContext:
 		return 0 == l.inAnnotation

modelicafmt_test.go

@@ -32,6 +32,7 @@ var exampleFileTests = []struct {
 }{
 	{"gmt-building.mo", "gmt-building-out.mo"},
 	{"gmt-coolingtower.mo", "gmt-coolingtower-out.mo"},
+	{"functions.mo", "functions-out.mo"},
 }
 
 func TestFormattingExamples(t *testing.T) {

thirdparty/Modelica.g4

@@ -82,8 +82,17 @@ language_specification
    : STRING
    ;
 
+// changed from original file
 external_function_call
-   : (component_reference '=')? IDENT '(' (expression_list)? ')'
+   : (component_reference '=')? IDENT '(' (external_function_call_args)? ')'
+   ;
+
+external_function_call_args
+   : external_function_call_argument (',' external_function_call_argument)*
+   ;
+
+external_function_call_argument
+   : expression
    ;
 
 element_list