Attachment #126588 for bug #250630

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





	stringLiteralExpCS ::= stringLiteralExpCS STRING_LITERAL
		/.$BeginJava
					IToken literalToken = getIToken($getToken(2));
					StringLiteralExpCS result = (StringLiteralExpCS) $getSym(1);
					result.setSymbol(result.getSymbol() +  literalToken.toString());
					result.setStringSymbol(result.getStringSymbol() + literalToken.toString());
					result.setUnescapedStringSymbol(result.getUnescapedStringSymbol() +  unescape(literalToken));
					int tokenLine = literalToken.getLine();
					setOffsets(result, result, literalToken);
					IToken prevToken = getParseStream().getTokenAt(literalToken.getTokenIndex() - 1);
					int prevTokenLine = prevToken.getLine();
					if (prevTokenLine == tokenLine) {
						reportError(lpg.lpgjavaruntime.ParseErrorCodes.INVALID_CODE, "", prevToken.getTokenIndex(), literalToken.getTokenIndex(), "Multiline string literals must be located in different lines!"); //$NON-NLS-1$ //$NON-NLS-2$
					}
					$setResult(result);
		  $EndJava

Lines 216-221 Link Here

(-)cst/EssentialOCL.g (-2 / +5 lines)
216	import org.eclipse.ocl.cst.SimpleNameCS;	216	import org.eclipse.ocl.cst.SimpleNameCS;
217	import org.eclipse.ocl.cst.SimpleTypeEnum;	217	import org.eclipse.ocl.cst.SimpleTypeEnum;
218	import org.eclipse.ocl.cst.StateExpCS;	218	import org.eclipse.ocl.cst.StateExpCS;
		219	import org.eclipse.ocl.cst.StringLiteralExpCS;
219	import org.eclipse.ocl.cst.TypeCS;	220	import org.eclipse.ocl.cst.TypeCS;
220	import org.eclipse.ocl.cst.VariableCS;	221	import org.eclipse.ocl.cst.VariableCS;
221	import org.eclipse.ocl.util.OCLStandardLibraryUtil;	222	import org.eclipse.ocl.util.OCLStandardLibraryUtil;
Lines 1237-1244 Link Here
1237	./	1238	./
1238	stringLiteralExpCS ::= STRING_LITERAL	1239	stringLiteralExpCS ::= STRING_LITERAL
1239	/.$BeginJava	1240	/.$BeginJava
1240	CSTNode result = createStringLiteralExpCS(unescape(getIToken(($getToken(1)))));	1241	IToken literalToken = getIToken($getToken(1));
1241	setOffsets(result, getIToken($getToken(1)));	1242	StringLiteralExpCS result = createStringLiteralExpCS(literalToken.toString());
		1243	result.setUnescapedStringSymbol(unescape(literalToken));
		1244	setOffsets(result, literalToken);
1242	$setResult(result);	1245	$setResult(result);
1243	$EndJava	1246	$EndJava
1244	./	1247	./

Return to bug 250630

Lines 986-1000 Link Here

(-)cst/miscellaneous.g (-6 / +8 lines)
986		986
987	stringLiteralExpCS ::= stringLiteralExpCS STRING_LITERAL	987	stringLiteralExpCS ::= stringLiteralExpCS STRING_LITERAL
988	/.$BeginJava	988	/.$BeginJava
		989	IToken literalToken = getIToken($getToken(2));
989	StringLiteralExpCS result = (StringLiteralExpCS) $getSym(1);	990	StringLiteralExpCS result = (StringLiteralExpCS) $getSym(1);
990	result.setStringSymbol(result.getStringSymbol() + unescape(getIToken(($getToken(2)))));	991	result.setSymbol(result.getSymbol() + literalToken.toString());
991	IToken token = getIToken($getToken(2));	992	result.setStringSymbol(result.getStringSymbol() + literalToken.toString());
992	int tokenLine = token.getLine();	993	result.setUnescapedStringSymbol(result.getUnescapedStringSymbol() + unescape(literalToken));
993	setOffsets(result, result, token);	994	int tokenLine = literalToken.getLine();
994	IToken prevToken = getParseStream().getTokenAt(token.getTokenIndex() - 1);	995	setOffsets(result, result, literalToken);
		996	IToken prevToken = getParseStream().getTokenAt(literalToken.getTokenIndex() - 1);
995	int prevTokenLine = prevToken.getLine();	997	int prevTokenLine = prevToken.getLine();
996	if (prevTokenLine == tokenLine) {	998	if (prevTokenLine == tokenLine) {
997	reportError(lpg.lpgjavaruntime.ParseErrorCodes.INVALID_CODE, "", prevToken.getTokenIndex(), token.getTokenIndex(), "Multiline string literals must be located in different lines!"); //$NON-NLS-1$ //$NON-NLS-2$	999	reportError(lpg.lpgjavaruntime.ParseErrorCodes.INVALID_CODE, "", prevToken.getTokenIndex(), literalToken.getTokenIndex(), "Multiline string literals must be located in different lines!"); //$NON-NLS-1$ //$NON-NLS-2$
998	}	1000	}
999	$setResult(result);	1001	$setResult(result);
1000	$EndJava	1002	$EndJava