Attachment 125276 Details for Bug 250630 – patch_org.eclipse.m2m.qvt.oml.cst.parser

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

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

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

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Igdalov

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

Size: 6.36 KB

patch

obsolete

>Index: cst/miscellaneous.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/cst/miscellaneous.g,v
>retrieving revision 1.20
>diff -u -r1.20 miscellaneous.g
>--- cst/miscellaneous.g	10 Feb 2009 15:24:53 -0000	1.20
>+++ cst/miscellaneous.g	10 Feb 2009 17:48:40 -0000
>@@ -989,7 +989,7 @@
> 	stringLiteralExpCS ::= stringLiteralExpCS STRING_LITERAL
> 		/.$BeginJava
> 					StringLiteralExpCS result = (StringLiteralExpCS) $getSym(1);
>-					result.setStringSymbol(result.getStringSymbol() +  getTokenText($getToken(2)));
>+					result.setStringSymbol(result.getStringSymbol() +  unescape(getIToken(($getToken(2)))));
> 					IToken token = getIToken($getToken(2));
> 					int tokenLine = token.getLine();
> 					setOffsets(result, result, token);
>Index: cst/QvtOpLPGParser.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/cst/QvtOpLPGParser.g,v
>retrieving revision 1.42
>diff -u -r1.42 QvtOpLPGParser.g
>--- cst/QvtOpLPGParser.g	4 Feb 2009 15:33:23 -0000	1.42
>+++ cst/QvtOpLPGParser.g	10 Feb 2009 17:48:40 -0000
>@@ -523,7 +523,7 @@
> 		/.$BeginJava
> 					ModelTypeCS result = createModelTypeCS(
> 							new Token(0, 0, 0),
>-							createStringLiteralExpCS("''"),
>+							null,
> 							$EMPTY_ELIST,
> 							$EMPTY_ELIST
> 						);
>@@ -590,12 +590,7 @@
> 		./
> 
> 	compliance_kindOpt ::= $empty
>-		/.$BeginJava
>-					CSTNode result = createStringLiteralExpCS("''");
>-					setOffsets(result, getIToken($getToken(1)));
>-					$setResult(result);
>-		  $EndJava
>-		./
>+		/.$NullAction./
> 	compliance_kindOpt -> stringLiteralExpCS
> 	--=== // model types compliance and metamodel declarations (end) ===--
> 
>Index: cst/EssentialOCL.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/cst/EssentialOCL.g,v
>retrieving revision 1.1
>diff -u -r1.1 EssentialOCL.g
>--- cst/EssentialOCL.g	8 Oct 2008 19:41:58 -0000	1.1
>+++ cst/EssentialOCL.g	10 Feb 2009 17:48:39 -0000
>@@ -1237,7 +1237,7 @@
> 		./
> 	stringLiteralExpCS ::= STRING_LITERAL
> 		/.$BeginJava
>-					CSTNode result = createStringLiteralExpCS(getTokenText($getToken(1)));
>+					CSTNode result = createStringLiteralExpCS(unescape(getIToken(($getToken(1)))));
> 					setOffsets(result, getIToken($getToken(1)));
> 					$setResult(result);
> 		  $EndJava
>Index: cst/OCLLexer.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/cst/OCLLexer.g,v
>retrieving revision 1.3
>diff -u -r1.3 OCLLexer.g
>--- cst/OCLLexer.g	8 Oct 2008 19:41:58 -0000	1.3
>+++ cst/OCLLexer.g	10 Feb 2009 17:48:39 -0000
>@@ -529,13 +529,16 @@
>                        '%' | '&' | '^' | ':' | ';' | "'" | '\' | '|' | '{' | '}' |
>                        '[' | ']' | '?' | ',' | '.' | '<' | '>' | '=' | '#' | DollarSign
> 
>-    SpecialNotDQ -> '+' | '-' | '/' | '(' | ')' | '*' | '!' | '@' | '`' | '~' |
>-                    '%' | '&' | '^' | ':' | ';' | "'" | '|' | '{' | '}' |
>-                    '[' | ']' | '?' | ',' | '.' | '<' | '>' | '=' | '#' | DollarSign
>-
>-    SpecialNotSQ -> '+' | '-' | '/' | '(' | ')' | '*' | '!' | '@' | '`' | '~' |
>-                    '%' | '&' | '^' | ':' | ';' | '"' | '|' | '{' | '}' | '\' |
>-                    '[' | ']' | '?' | ',' | '.' | '<' | '>' | '=' | '#' | DollarSign
>+    SpecialNotSQNotDQ -> '+' | '-' | '/' | '(' | ')' | '*' | '!' | '@' | '`' | '~' |
>+                         '%' | '&' | '^' | ':' | ';' | '|' | '{' | '}' |
>+                         '[' | ']' | '?' | ',' | '.' | '<' | '>' | '=' | '#' | DollarSign
>+
>+    
>+    SpecialNotDQ -> SpecialNotSQNotDQ | "'"
>+    SpecialNotSQ -> SpecialNotSQNotDQ | '"'
>+
>+    EscapedSymbols -> NotSQNotDQ | '"' | "'" | '\'
>+    BackslashEscapedSymbol -> '\' EscapedSymbols
> 
>     NotSlashOrStar -> Letter
>                     | Digit
>@@ -551,6 +554,11 @@
>             | FF
>             | CtlCharNotWS
> 
>+    NotSQNotDQ -> Letter
>+           | Digit
>+           | SpecialNotSQNotDQ
>+           | Space
>+
>     NotDQ -> Letter
>            | Digit
>            | SpecialNotDQ
>@@ -564,6 +572,7 @@
>            | SpecialNotSQ
>            | Space
>            | EscapedSQ
>+           | BackslashEscapedSymbol
>            --| '\' u HexDigit HexDigit HexDigit HexDigit
>            --| '\' OctalDigit
> 
>Index: cst/QvtOpLexer.g
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/cst/QvtOpLexer.g,v
>retrieving revision 1.5
>diff -u -r1.5 QvtOpLexer.g
>--- cst/QvtOpLexer.g	2 Feb 2009 11:44:33 -0000	1.5
>+++ cst/QvtOpLexer.g	10 Feb 2009 17:48:40 -0000
>@@ -57,6 +57,9 @@
> 
> 	Identifier -> QuotedName
> 	QuotedName -> '"' SLNotDQ '"'
>+	EscapedDQ -> '\' DoubleQuote
>+	NotDQ -> EscapedDQ -- QVT unites backslash-escape sequences. See rules below.
>+	NotSQ -> EscapedSQ -- QVT prohibits '' escaping within SQ string literals
> 
> $End
> 
>@@ -168,7 +171,6 @@
> 		  $EndAction
> 		./
> 
>-
> 	NotSQ -> HT
> 	NotSQ -> LF
> 	NotSQ -> CR
>@@ -177,6 +179,8 @@
> 	NotDQ -> LF
> 	NotDQ -> CR
> 
>+	NotDQ -> BackslashEscapedSymbol
>+
> 	Token ::= DoubleQuote SLNotDQOpt DoubleQuote
> 		/.$BeginAction
> 					makeToken($_STRING_LITERAL);
>@@ -185,5 +189,4 @@
> 
> 	SLNotDQOpt -> $empty
> 			| SLNotDQ
>-
> $End
>\ No newline at end of file
>Index: src/org/eclipse/m2m/internal/qvt/oml/cst/parser/AbstractQVTParser.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.m2m/org.eclipse.m2m.qvt.oml/plugins/org.eclipse.m2m.qvt.oml.cst.parser/src/org/eclipse/m2m/internal/qvt/oml/cst/parser/AbstractQVTParser.java,v
>retrieving revision 1.36
>diff -u -r1.36 AbstractQVTParser.java
>--- src/org/eclipse/m2m/internal/qvt/oml/cst/parser/AbstractQVTParser.java	6 Feb 2009 17:32:14 -0000	1.36
>+++ src/org/eclipse/m2m/internal/qvt/oml/cst/parser/AbstractQVTParser.java	10 Feb 2009 17:48:40 -0000
>@@ -1063,4 +1063,8 @@
> 		}
> 	}
> 
>-}	
>+	@Override
>+	protected boolean isNonStdSQSupported() {
>+		return false;
>+	}
>+}
>\ No newline at end of file

Actions: View | Diff

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