From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 15 Nov 2017 08:11:52 +0000 (+0200)
Subject: Merge "(refs #7619) Better parenthese in derived show"
X-Git-Tag: v1.31.0~36
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=caad4b50af37ff3731a3e9a557dc697e9116de56;hp=5a1f5c5ff23c699300f0b3e5e9ac30609734ab4d;p=simantics%2Fplatform.git

Merge "(refs #7619) Better parenthese in derived show"
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/deriving/ShowDeriver.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/deriving/ShowDeriver.java
index afd2a4f89..40c3605e7 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/deriving/ShowDeriver.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/deriving/ShowDeriver.java
@@ -81,33 +81,55 @@ class ShowDeriver implements InstanceDeriver {
             for(int i=0;i<l;++i) {
                 par[i] = "v" + i;
             }
-            Expression lhs = new EApply(
-                    new EVar("<+"),
-                    new EVar("sb"),
-                    new EApply(new EVar(constructor.name.name), Expressions.vars(par))
-                    );
-            Expression value;
-            value = new EApply(new EVar("<<"), new EVar("sb"),
-                    new ELiteral(new StringConstant(constructor.name.name)));
-            for(int i=0;i<l;++i) {
-                value = new EApply(new EVar("<<"),
-                        value,
-                        new ELiteral(new StringConstant(" "))
-                        );
-                value = new EApply(new EVar("<+"),
-                        value,
-                        new EApply(new EVar("Par"), new ELiteral(CONST_10), new EVar("v" + i))
+            
+            // <+
+            {
+                Expression lhs = new EApply(
+                        new EVar("<+"),
+                        new EVar("sb"),
+                        new EApply(new EVar(constructor.name.name), Expressions.vars(par))
                         );
+                Expression value;
+                value = new EApply(new EVar("<<"), new EVar("sb"),
+                        new ELiteral(new StringConstant(constructor.name.name)));
+                for(int i=0;i<l;++i) {
+                    value = new EApply(new EVar("<<"),
+                            value,
+                            new ELiteral(new StringConstant(" "))
+                            );
+                    value = new EApply(new EVar("<+"),
+                            value,
+                            new EApply(new EVar("Par"), new ELiteral(CONST_10), new EVar("v" + i))
+                            );
+                }
+    
+                try {
+                    DValueAst valueAst = new DValueAst(lhs, value);
+                    valueAst.setLocationDeep(der.location);
+                    valueDefs.add(valueAst);
+                    /*valueDefs.addAnnotation("<+", new DAnnotationAst(new EVar("@private"), 
+                            Collections.<Expression>emptyList()));*/
+                } catch (NotPatternException e) {
+                    errorLog.log(e.getExpression().location, "Not a pattern.");
+                }
             }
-
-            try {
-                DValueAst valueAst = new DValueAst(lhs, value);
-                valueAst.setLocationDeep(der.location);
-                valueDefs.add(valueAst);
-                /*valueDefs.addAnnotation("<+", new DAnnotationAst(new EVar("@private"), 
-                        Collections.<Expression>emptyList()));*/
-            } catch (NotPatternException e) {
-                errorLog.log(e.getExpression().location, "Not a pattern.");
+            
+            // precedence
+            {
+                Expression lhs = new EApply(
+                        new EVar("precedence"),
+                        new EApply(new EVar(constructor.name.name), Expressions.vars(par))
+                        );
+                Expression value;
+                value = new ELiteral(new IntegerConstant(l == 0 ? 0 : 20));
+    
+                try {
+                    DValueAst valueAst = new DValueAst(lhs, value);
+                    valueAst.setLocationDeep(der.location);
+                    valueDefs.add(valueAst);
+                } catch (NotPatternException e) {
+                    errorLog.log(e.getExpression().location, "Not a pattern.");
+                }
             }
         }
         instancesAst.add(new ProcessedDInstanceAst(instanceAst, valueDefs));