Attachment 125275 Details for Bug 250630 – patch_org.eclipse.m2m.qvt.oml

[patch] patch_org.eclipse.m2m.qvt.oml

patch_org.eclipse.m2m.qvt.oml (text/plain), 5.54 KB, created by Alexander Igdalov

on 2009-02-10 13:03:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Igdalov

Created: 2009-02-10 13:03:12 EST

Size: 5.54 KB

patch

obsolete

>Index: src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtEnvironmentBase.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtEnvironmentBase.java,v
>retrieving revision 1.13
>diff -u -r1.13 QvtEnvironmentBase.java
>--- src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtEnvironmentBase.java	28 Jan 2009 11:47:28 -0000	1.13
>+++ src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtEnvironmentBase.java	10 Feb 2009 17:47:17 -0000
>@@ -31,11 +31,11 @@
> import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.m2m.internal.qvt.oml.ast.parser.QvtOperationalUtil;
>-import org.eclipse.m2m.qvt.oml.ecore.ImperativeOCL.ImperativeOCLPackage;
> import org.eclipse.m2m.internal.qvt.oml.expressions.ImperativeOperation;
> import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
> import org.eclipse.m2m.internal.qvt.oml.expressions.VarParameter;
> import org.eclipse.m2m.internal.qvt.oml.stdlib.QVTUMLReflection;
>+import org.eclipse.m2m.qvt.oml.ecore.ImperativeOCL.ImperativeOCLPackage;
> import org.eclipse.ocl.LookupException;
> import org.eclipse.ocl.ecore.CallOperationAction;
> import org.eclipse.ocl.ecore.CollectionType;
>@@ -44,6 +44,7 @@
> import org.eclipse.ocl.ecore.EcorePackage;
> import org.eclipse.ocl.ecore.SendSignalAction;
> import org.eclipse.ocl.expressions.Variable;
>+import org.eclipse.ocl.options.ParsingOptions;
> import org.eclipse.ocl.types.OCLStandardLibrary;
> import org.eclipse.ocl.util.OCLStandardLibraryUtil;
> import org.eclipse.ocl.util.TypeUtil;
>@@ -93,14 +94,17 @@
> 
> 	protected QvtEnvironmentBase(QvtEnvironmentBase parent) {
> 		super(parent);
>+		setOption(ParsingOptions.USE_BACKSLASH_ESCAPE_PROCESSING, true);
> 	}
> 
> 	protected QvtEnvironmentBase(EPackage.Registry reg, Resource resource) {
> 		super(reg, resource);
>+		setOption(ParsingOptions.USE_BACKSLASH_ESCAPE_PROCESSING, true);
> 	}
> 
> 	protected QvtEnvironmentBase(EPackage.Registry reg) {
> 		super(reg);
>+		setOption(ParsingOptions.USE_BACKSLASH_ESCAPE_PROCESSING, true);
> 	}
> 	
> 	public abstract Module getModuleContextType();	
>Index: src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java,v
>retrieving revision 1.88
>diff -u -r1.88 QvtOperationalVisitorCS.java
>--- src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java	6 Feb 2009 18:07:50 -0000	1.88
>+++ src/org/eclipse/m2m/internal/qvt/oml/ast/parser/QvtOperationalVisitorCS.java	10 Feb 2009 17:47:17 -0000
>@@ -225,9 +225,6 @@
> import org.eclipse.ocl.utilities.UMLReflection;
> import org.eclipse.osgi.util.NLS;
> 
>-import com.ibm.icu.lang.UCharacter;
>-
>-
> public class QvtOperationalVisitorCS
> 		extends AbstractOCLAnalyzer<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, 
> 							CallOperationAction, SendSignalAction, Constraint, EClass, EObject> { 	// FIXME - changed in M3.4 migration
>@@ -4454,57 +4451,4 @@
> 		annotation.getReferences().add(element);
> 		return annotation;
> 	}
>-
>-	@Override
>-	protected org.eclipse.ocl.expressions.StringLiteralExp<EClassifier> stringLiteralExpCS(
>-			StringLiteralExpCS stringLiteralExpCS,
>-			Environment<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> env) {
>-
>-		StringLiteralExp<EClassifier> astNode = oclFactory.createStringLiteralExp();
>-		initASTMapping(env, astNode, stringLiteralExpCS);
>-		String stringLiteral = stringLiteralExpCS.getStringSymbol();
>-		List<String> singlelineStringLiterals = splitMultilineStringLiteral(stringLiteral);
>-		String[] processedSinglelineStringLiterals = new String[singlelineStringLiterals.size()];
>-		for (int i = 0; i < processedSinglelineStringLiterals.length; i++) {
>-			processedSinglelineStringLiterals[i] = processSinglelineStringLiteral(singlelineStringLiterals.get(i));
>-		}
>-		StringBuilder stringBuilder = new StringBuilder();
>-		for (String processedSinglelineStringLiteral : processedSinglelineStringLiterals) {
>-			stringBuilder.append(processedSinglelineStringLiteral);
>-		}
>-		astNode.setStringSymbol(stringBuilder.toString());
>-		astNode.setType(env.getOCLStandardLibrary().getString());
>-		
>-		TRACE("stringLiteralExpCS", "String: " + stringLiteralExpCS.getSymbol());//$NON-NLS-2$//$NON-NLS-1$
>-			
>-		return astNode;
>-	}
>-
>-	private List<String> splitMultilineStringLiteral(String stringLiteral) {
>-		List<String> singlelineStringLiterals = new ArrayList<String>();
>-		char quote = stringLiteral.charAt(0);
>-		boolean isInQuotes = true;
>-		int leftIndex = 1;
>-		for (int i = 1, n = stringLiteral.length(); i < n; i++) {
>-			char ch = stringLiteral.charAt(i);
>-			if (isInQuotes) {
>-				if ((ch == quote)
>-						&& (stringLiteral.charAt(i - 1) != '\\')) {
>-						singlelineStringLiterals.add(stringLiteral.substring(leftIndex, i));
>-						isInQuotes = false;
>-					}
>-			} else {
>-				if (!UCharacter.isWhitespace(ch)) {
>-					quote = ch;
>-					leftIndex = i + 1;
>-					isInQuotes = true;
>-				}
>-			}
>-		}
>-		return singlelineStringLiterals;
>-	}
>-	
>-	private String processSinglelineStringLiteral(String rawString) {
>-		return rawString;
>-	}
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 250630: 124845 | 125275 | 125276 | 125277 | 126588