Add meta variables to SDF3 Stratego mix syntax test

org.metaborg.meta.lang.template/trans/analysis/name-constraints.str

@@ -428,3 +428,17 @@ rules
       where
         <?s> s';
         <eq> (<length> ty*, <length> ty'*)
+
+rules
+
+  nabl-constraint(|ctx):
+      section@VariablesProductive(_) -> <fail>
+  where
+      msg := "The SDF2 variables section is no longer support, please write your own A.meta-var and A.meta-listvar definitions in context-free syntax";
+      <task-create-error(|ctx, msg)> section
+
+  nabl-constraint(|ctx):
+      section@LexVariablesProductive(_) -> <fail>
+  where
+      msg := "The SDF2 variables section is no longer support, please write your own A.meta-var and A.meta-listvar definitions in context-free syntax";
+      <task-create-error(|ctx, msg)> section

org.metaborg.sdf3.meta.integrationtest/editor/Main.esv

@@ -13,6 +13,11 @@ menus
 
   menu: "Transform"
 
-    action: "Swap (abstract syntax)"        = swap-editor-abstract-syntax        (source)
-    action: "Swap (concrete syntax)"        = swap-editor-concrete-syntax        (source)
-    action: "Swap (concrete syntax simple)" = swap-editor-concrete-syntax-simple (source)
+    action: "Swap exps (abstract syntax)"              = editor-action-swap-exps-abstract-syntax              (source)
+    action: "Swap exps (concrete syntax)"              = editor-action-swap-exps-concrete-syntax              (source)
+    action: "Swap exps (concrete syntax simple)"       = editor-action-swap-exps-concrete-syntax-simple       (source)
+    action: "Swap exps (concrete syntax var)"          = editor-action-swap-exps-concrete-syntax-var          (source)
+    action: "Reverse stmts (concrete syntax varlist)"  = editor-action-reverse-stmts-concrete-syntax-varlist  (source)
+    action: "Surround stmts (concrete syntax varlist)" = editor-action-surround-stmts-concrete-syntax-varlist (source)
+    action: "Surround stmts 2 (concrete syntax varlist)" = editor-action-surround-stmts-concrete-syntax-varlist2 (source)
+    action: "Surround stmts (concrete syntax list fromterm)" = editor-action-surround-stmts-concrete-syntax-list-fromterm (source)

org.metaborg.sdf3.meta.integrationtest/syntax/foo.sdf3

@@ -9,12 +9,45 @@ imports
 
 context-free start-symbols
 
-  StrategoLang-Module
+  Module
+
+context-free sorts
+
+  Module StmtListMeta
 
 context-free syntax
 
+  Module = StrategoLang-Module
+
   StrategoLang-PreTerm.ToTerm = <|[ <Stmt> ]|>
   StrategoLang-PreTerm.ToTerm = <stmt |[ <Stmt> ]|>
 
+  StrategoLang-PreTerm.ToTerm = <|[ <Start> ]|>
+  StrategoLang-PreTerm.ToTerm = <program |[ <Start> ]|>
+
   Exp.FromTerm = [~[StrategoLang-Term]]
   Exp.FromTerm = [~exp:[StrategoLang-Term]]
+
+  StmtListMeta.FromTerm = [~*[StrategoLang-Term]]
+
+  Stmt+ = StmtListMeta
+  Stmt+.Conc = Stmt+ StmtListMeta
+
+context-free syntax // meta variables
+
+  Exp.meta-var = ExpVar
+
+  StmtListMeta.meta-listvar = StmtListVar
+
+lexical sorts
+
+  ExpVar StmtListVar
+
+lexical syntax
+
+  ExpVar = 'exp' [0-9]*
+  StmtListVar = 'stmt' [0-9]* '*'
+
+lexical restrictions
+
+  ExpVar -/- [0-9]

org.metaborg.sdf3.meta.integrationtest/syntax/thesyntax.sdf3

@@ -15,7 +15,7 @@ context-free sorts
 
 context-free syntax
 
-  Start.Program = Stmt
+  Start.Program = Stmt+
   Stmt.Stmt = [[Exp];]
   Exp.Add = [[Exp] + [Exp]]
   Exp.Var = VAR

org.metaborg.sdf3.meta.integrationtest/test/swap.spt

@@ -4,8 +4,18 @@ language sdf3-meta-integrationtest
 
 start symbol Start
 
-test swap [[x + y;]] transform "Transform -> Swap (abstract syntax)"        to [[y + x;]]
+test swap [[x + y;]] transform "Transform -> Swap exps (abstract syntax)"        to [[y + x;]]
 
-test swap [[x + y;]] transform "Transform -> Swap (concrete syntax)"        to [[y + x;]]
+test swap [[x + y;]] transform "Transform -> Swap exps (concrete syntax)"        to [[y + x;]]
 
-test swap [[x + y;]] transform "Transform -> Swap (concrete syntax simple)" to [[y + x;]]
+test swap [[x + y;]] transform "Transform -> Swap exps (concrete syntax simple)" to [[y + x;]]
+
+test swap [[x + y;]] transform "Transform -> Swap exps (concrete syntax var)"    to [[y + x;]]
+
+test swap [[x; y;]] transform "Transform -> Reverse stmts (concrete syntax varlist)" to [[y; x;]]
+
+test swap [[x; y;]] transform "Transform -> Surround stmts (concrete syntax varlist)" to [[a; x; y; b;]]
+
+test swap [[x; y;]] transform "Transform -> Surround stmts 2 (concrete syntax varlist)" to [[y; x; a; x; y; x; y; b; y; x;]]
+
+test swap [[x; y;]] transform "Transform -> Surround stmts (concrete syntax list fromterm)" to [[a; x; y; b;]]

org.metaborg.sdf3.meta.integrationtest/trans/swap.str

@@ -7,20 +7,49 @@ imports
 
 rules
 
-  swap-editor-abstract-syntax        = swap-editor(swap-exp-abstract-syntax|)
-  swap-editor-concrete-syntax        = swap-editor(swap-exp-concrete-syntax|)
-  swap-editor-concrete-syntax-simple = swap-editor(swap-exp-concrete-syntax-simple|)
-
-  swap-editor(swap-exp|):
-    (_, _, ast, path, _) -> (path, <topdown(try(swap-exp))> ast) 
-
-  swap-exp-abstract-syntax:
+  editor-action-swap-exps-abstract-syntax              = editor-action(swap-exps-abstract-syntax)
+  editor-action-swap-exps-concrete-syntax              = editor-action(swap-exps-concrete-syntax)
+  editor-action-swap-exps-concrete-syntax-simple       = editor-action(swap-exps-concrete-syntax-simple)
+  editor-action-swap-exps-concrete-syntax-var          = editor-action(swap-exps-concrete-syntax-var)
+  editor-action-reverse-stmts-concrete-syntax-varlist  = editor-action(reverse-stmts-concrete-syntax-varlist)
+  editor-action-surround-stmts-concrete-syntax-varlist = editor-action(surround-stmts-concrete-syntax-varlist)
+  editor-action-surround-stmts-concrete-syntax-varlist2 = editor-action(surround-stmts-concrete-syntax-varlist2)
+  editor-action-surround-stmts-concrete-syntax-list-fromterm = editor-action(surround-stmts-concrete-syntax-list-fromterm)
+
+  editor-action(s):
+    (_, _, ast, path, _) -> (path, <oncetd(s)> ast) 
+
+  swap-exps-abstract-syntax:
     Add(e1, e2) -> Add(e2, e1)
 
-  swap-exp-concrete-syntax:
+  swap-exps-concrete-syntax:
     stmt |[ ~exp:e1 + ~exp:e2 ; ]| ->
     stmt |[ ~exp:e2 + ~exp:e1 ; ]|
 
-  swap-exp-concrete-syntax-simple:
+  swap-exps-concrete-syntax-simple:
     |[ ~e1 + ~e2 ; ]| ->
-    |[ ~e2 + ~e1 ; ]|
+    |[ ~e2 + ~e1 ; ]|
+
+  swap-exps-concrete-syntax-var:
+    |[ exp + exp2 ; ]| ->
+    |[ exp2 + exp ; ]|
+
+  reverse-stmts-concrete-syntax-varlist:
+    |[ stmt1* ]| ->
+    |[ stmt2* ]|
+  where stmt2* := <reverse> stmt1*
+
+  surround-stmts-concrete-syntax-varlist:
+    |[ stmt1* ]|  ->
+    program |[ a; stmt1* b; ]|
+  where stmt2* := <reverse> stmt1*
+
+  surround-stmts-concrete-syntax-varlist2:
+    |[ stmt1* ]|  ->
+    program |[ stmt2* a; stmt1* stmt1* b; stmt2* ]|
+  where stmt2* := <reverse> stmt1*
+
+  surround-stmts-concrete-syntax-list-fromterm:
+    |[ ~*stmt1* ]|  ->
+    program |[ a; ~*stmt1* b; ]|
+  where stmt2* := <reverse> stmt1*

sdf3.stratego2.integrationtest/.gitignore

@@ -0,0 +1,14 @@
+/.cache
+/bin
+/src-gen
+/target
+
+/.classpath
+/.project
+/.settings
+/.factorypath
+
+/.polyglot.metaborg.yaml
+
+/trans/foo.tbl
+/trans/table-foo.bin

sdf3.stratego2.integrationtest/.mvn/extensions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>org.metaborg</groupId>
+    <artifactId>spoofax-maven-plugin-pomless</artifactId>
+    <version>2.6.0-SNAPSHOT</version>
+  </extension>
+</extensions>

sdf3.stratego2.integrationtest/editor/Main.esv

@@ -0,0 +1,23 @@
+module Main
+
+language
+
+  extensions : s3mit
+
+  provider : target/metaborg/stratego.jar
+
+  table         : target/metaborg/sdf.tbl
+  start symbols : Start
+
+menus
+
+  menu: "Transform"
+
+    action: "Swap exps (abstract syntax)"              = editor-action-swap-exps-abstract-syntax              (source)
+    action: "Swap exps (concrete syntax)"              = editor-action-swap-exps-concrete-syntax              (source)
+    action: "Swap exps (concrete syntax simple)"       = editor-action-swap-exps-concrete-syntax-simple       (source)
+    action: "Swap exps (concrete syntax var)"          = editor-action-swap-exps-concrete-syntax-var          (source)
+    action: "Reverse stmts (concrete syntax varlist)"  = editor-action-reverse-stmts-concrete-syntax-varlist  (source)
+    action: "Surround stmts (concrete syntax varlist)" = editor-action-surround-stmts-concrete-syntax-varlist (source)
+    action: "Surround stmts 2 (concrete syntax varlist)" = editor-action-surround-stmts-concrete-syntax-varlist2 (source)
+    action: "Surround stmts (concrete syntax list fromterm)" = editor-action-surround-stmts-concrete-syntax-list-fromterm (source)

sdf3.stratego2.integrationtest/metaborg.yaml

@@ -0,0 +1,45 @@
+---
+id: org.metaborg:sdf3.stratego2.integrationtest:2.6.0-SNAPSHOT
+name: sdf3-stratego2-integrationtest
+dependencies:
+  compile:
+  - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion}
+  - org.metaborg:org.metaborg.meta.lang.template:${metaborgVersion}
+  - org.metaborg:org.metaborg.meta.lang.spt:${metaborgVersion}
+  # Workaround to get Stratego 2 dialect to register before trans/swap.str2 is parsed
+  - org.metaborg:org.metaborg.meta.lang.stratego:${metaborgVersion}
+  - org.metaborg:stratego.lang:${metaborgVersion}
+  source:
+  - org.metaborg:meta.lib.spoofax:${metaborgVersion}
+  - org.metaborg:stratego.lang:${metaborgVersion}
+  - org.metaborg:strategolib:${metaborgVersion}
+  - org.metaborg:gpp:${metaborgVersion}
+  java:
+  - org.metaborg:strategolib:${metaborgVersion}
+  - org.metaborg:gpp:${metaborgVersion}
+pardonedLanguages:
+- EditorService
+- Stratego-Sugar
+- SDF
+language:
+  sdf:
+    pretty-print: sdf3-stratego2-integrationtest
+    version: sdf3
+    sdf2table: java
+    sdf-meta:
+     - foo
+    placeholder:
+      prefix: "$"
+  stratego:
+    format: jar
+    args:
+    - -la
+    - stratego-sglr
+    - -la
+    - stratego-xtc
+    - -la
+    - stratego-aterm
+    - -la
+    - stratego-sdf
+    - -la
+    - strc

sdf3.stratego2.integrationtest/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>sdf3.stratego2.integrationtest</artifactId>
+  <packaging>spoofax-language</packaging>
+
+  <parent>
+    <groupId>org.metaborg</groupId>
+    <artifactId>parent.language</artifactId>
+    <version>2.6.0-SNAPSHOT</version>
+    <relativePath>../../releng/parent/java</relativePath>
+  </parent>
+
+  <dependencies>
+    <!-- compile -->
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>org.metaborg.meta.lang.esv</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>org.metaborg.meta.lang.template</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>org.metaborg.meta.lang.spt</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>stratego.lang</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+
+    <!-- source -->
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>meta.lib.spoofax</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>strategolib</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+    <dependency>
+      <groupId>org.metaborg</groupId>
+      <artifactId>gpp</artifactId>
+      <version>${metaborg-version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.metaborg</groupId>
+        <artifactId>spoofax-maven-plugin</artifactId>
+        <version>${metaborg-version}</version>
+        <executions>
+          <execution>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <languageUnderTest>org.metaborg:sdf3.stratego2.integrationtest:${metaborg-version}</languageUnderTest>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>