[unrelated] Fix undefined variable

4 files changed, 19 insertions, 15 deletions

diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/MiToSi/mitosi.qvtr b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/MiToSi/mitosi.qvtr
index 4d100249f..4f44e7ee3 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/MiToSi/mitosi.qvtr
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/MiToSi/mitosi.qvtr
@@ -9,8 +9,8 @@
  *     TCS - initial implementation for ModelMorf
  *     E.D.Willink - alignment with evolved specification
  *******************************************************************************/
-import umlmmmi : 'umlmmmi.emof'::umlmmmi; 
-import javammsi : 'javammsi.emof'::javammsi; 
+import umlmmmi : 'umlMM.emof'::umlmmmi; 
+import javammsi : 'javaMM.emof'::javammsi; 
 
 transformation MiToSi(uml:umlmmmi, java:javammsi)
 {
@@ -89,6 +89,7 @@ transformation MiToSi(uml:umlmmmi, java:javammsi)
 		csup: umlmmmi::Class;
 		isup: javammsi::Interface;
 		someI: javammsi::Interface;
+		z : javammsi::Interface;
 
 		domain uml 
 		c:Class
@@ -107,7 +108,7 @@ transformation MiToSi(uml:umlmmmi, java:javammsi)
 		when 
 		{
 			(RClassToInterface(csup, isup) or ClassToInterface(csup, isup));
-			not ClassToClass(c, _);
+			not ClassToClass(c, z);
 		}
 	}   
 
@@ -135,4 +136,3 @@ transformation MiToSi(uml:umlmmmi, java:javammsi)
 		}
 	}   
 }
-
diff --git a/examples/org.eclipse.qvtd.examples/buildZips.xml b/examples/org.eclipse.qvtd.examples/buildZips.xml
index dec8d9fe9..cce67aa53 100644
--- a/examples/org.eclipse.qvtd.examples/buildZips.xml
+++ b/examples/org.eclipse.qvtd.examples/buildZips.xml
@@ -4,8 +4,8 @@
 	</target>
 
 	<patternset id="qvtc.excludes" excludes="qvtcbin/**"/>
-	<patternset id="qvtr.excludes" excludes="bin/** qvtrbin/** src/** .settings/** META-INF/**"/>
-	
+	<patternset id="qvtr.excludes" excludes="bin/** qvtrbin/** src/** .settings/** META-INF/** .classpath build.properties about.html"/>
+
 	<target name="zip.examples" depends="init">
 		<!-- ../../examples is the prefcerred project layout
 		     ../ is the result of an Import Project Set File -->
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java
index fbfd60300..6af578d40 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java
@@ -1527,18 +1527,20 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
 		//
 		//UnrestrictedName returns ecore::EString:
 		//
-		//	EssentialOCLUnrestrictedName | "checkonly" | "default_values" | "domain" | "enforce" | "extends" | "implementedby" |
+		//	EssentialOCLUnrestrictedName //|   '_'
+		// | "checkonly" | "default_values" | "domain" | "enforce" | "extends" |
 		//
-		//	"import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top" |
+		//	"implementedby" | "import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top"
 		//
-		//	"transformation" | "when" | "where";
+		//	| "transformation" | "when" | "where";
 		public ParserRule getRule() { return rule; }
 
-		//EssentialOCLUnrestrictedName | "checkonly" | "default_values" | "domain" | "enforce" | "extends" | "implementedby" |
+		//EssentialOCLUnrestrictedName //|   '_'
+		// | "checkonly" | "default_values" | "domain" | "enforce" | "extends" |
 		//
-		//"import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top" | "transformation"
+		//"implementedby" | "import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top"
 		//
-		//| "when" | "where"
+		//| "transformation" | "when" | "where"
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//EssentialOCLUnrestrictedName
@@ -2013,11 +2015,12 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
 	//
 	//UnrestrictedName returns ecore::EString:
 	//
-	//	EssentialOCLUnrestrictedName | "checkonly" | "default_values" | "domain" | "enforce" | "extends" | "implementedby" |
+	//	EssentialOCLUnrestrictedName //|   '_'
+	// | "checkonly" | "default_values" | "domain" | "enforce" | "extends" |
 	//
-	//	"import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top" |
+	//	"implementedby" | "import" | "library" | "key" | "overrides" | "primitive" | "query" | "relation" | "replace" | "top"
 	//
-	//	"transformation" | "when" | "where";
+	//	| "transformation" | "when" | "where";
 	public UnrestrictedNameElements getUnrestrictedNameAccess() {
 		return (pUnrestrictedName != null) ? pUnrestrictedName : (pUnrestrictedName = new UnrestrictedNameElements());
 	}
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
index 0fe539201..4ccf92e91 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
@@ -128,6 +128,7 @@ TypedRefCS returns base::TypedRefCS:
 
 UnrestrictedName returns ecore::EString:
 	EssentialOCLUnrestrictedName
+//|   '_'
 |   'checkonly'
 |   'default_values'
 |   'domain'