Configuration name parsing, equation view tweak and ( ) in modelica expression synta...

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@14152 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/EquationView.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/EquationView.java
index b924cb35bce8dbb4496fea42d6941f3674c57494..1e83532880af8c5858a6dc369d568f5855694992 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/EquationView.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/equation/EquationView.java
@@ -70,7 +70,6 @@ public class EquationView extends ViewPart implements ISelectionListener {
 \r
     // Dummies\r
     //Composite range;  \r
-    Composite emptyComposite;\r
 \r
     @Override    \r
     public void createPartControl(Composite parent) {\r
@@ -108,7 +107,7 @@ public class EquationView extends ViewPart implements ISelectionListener {
         };\r
         getViewSite().getPage().addPartListener(focusLostListener);\r
 \r
-        GridLayoutFactory.fillDefaults().numColumns(5).margins(3, 3).applyTo(parent);\r
+        GridLayoutFactory.fillDefaults().numColumns(4).margins(3, 3).applyTo(parent);\r
 \r
 \r
 \r
@@ -133,11 +132,6 @@ public class EquationView extends ViewPart implements ISelectionListener {
         GridDataFactory.fillDefaults().span(1, 4).applyTo(shortcutTabs);\r
         addVariableTableListeners();\r
 \r
-        // Right side of the view: Details, comments\r
-        emptyComposite = new Composite(parent, SWT.NONE);\r
-        GridDataFactory.fillDefaults().span(1,4).grab(true, true).applyTo(emptyComposite);\r
-        GridLayoutFactory.fillDefaults().applyTo(emptyComposite);\r
-\r
         // Below variable name: Equation\r
         expressionComposite = new ExpressionComposite(parent, SWT.NONE);\r
         GridDataFactory.fillDefaults().span(3, 1).grab(true, true).applyTo(expressionComposite);\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
index 426ce0c5577d5cc2a55b2d47cc24a14c1842c023..14c4e66e5fac148869530801bc106bfaf94fdc0b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -139,7 +139,7 @@ void primary() : {
   | "true"\r
   |   LOOKAHEAD( name() "(" ) name() function_call_args()\r
   | component_reference()\r
-  // | "(" output_expression_list() ")"\r
+  | "(" output_expression_list() ")"\r
   | "[" expression_list() ( ";" expression_list() )* "]"\r
   //| "{" function_arguments() "}"\r
   | "end"\r
@@ -189,6 +189,12 @@ void named_argument() : {
        <IDENT> "=" expression()\r
 }\r
 \r
+void output_expression_list() : {\r
+} {\r
+       ( expression() )? ( "," ( expression() )? )*\r
+}\r
+\r
+\r
 void expression_list() : {\r
 } {\r
     expression() ( "," expression() )*\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
index 280c59b6bc020bcf40c89c536b164ae3870abcd5..a1bf57826bd08cc519b06addfd3a99b13e6afdca 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
@@ -16,7 +16,7 @@ public class ModelicaWriter {
 \r
     public void write(Configuration conf) {\r
         conf.update();\r
-        b.append("model ").append(conf.name).append('\n');\r
+        b.append("model ").append(conf.name.replace(" ", "")).append('\n');\r
         for(IElement element : conf.elements)\r
             if(element instanceof Variable) {\r
                 IExpression expr = ((Variable)element).expression;\r
@@ -50,7 +50,7 @@ public class ModelicaWriter {
                     if (app != null) b.append(app);\r
                 }\r
             }\r
-        b.append("end ").append(conf.name).append(";\n");\r
+        b.append("end ").append(conf.name.replace(" ", "")).append(";\n");\r
 \r
         if(insertInterpolate)\r
             b.append(\r