minor fixes
fixed delimitor length handling for values != 1 in unescapeString
fixed context retrieval when importing context
diff --git a/plugins/org.eclipse.gmt.tcs.injector/src/org/eclipse/gmt/tcs/injector/TCSRuntime.java b/plugins/org.eclipse.gmt.tcs.injector/src/org/eclipse/gmt/tcs/injector/TCSRuntime.java
index 249e30d..af93a94 100644
--- a/plugins/org.eclipse.gmt.tcs.injector/src/org/eclipse/gmt/tcs/injector/TCSRuntime.java
+++ b/plugins/org.eclipse.gmt.tcs.injector/src/org/eclipse/gmt/tcs/injector/TCSRuntime.java
@@ -604,7 +604,7 @@
if(realValue != null) {
Context context = (Context)contextByElement.get(realValue);
if(importContext && (context != null)) {
- ((Context)contextByElement.get(object)).importContext(context);
+ currentContext.importContext(context);
}
}
}
@@ -637,7 +637,7 @@
public String unescapeString(String s, int delimLength) {
StringBuffer ret = new StringBuffer();
// get rid of the starting and ending delimiters (e.g., '\'', '"')
- s = s.substring(delimLength, s.length()-(delimLength * 2 - 1));
+ s = s.substring(delimLength, s.length() - delimLength);
CharacterIterator ci = new StringCharacterIterator(s);
char c = ci.first();