Commit 749f8f1a authored by Kristof Szabados's avatar Kristof Szabados
Browse files

indexing string concatentation is fixed to give the right result.


Signed-off-by: Kristof Szabados's avatarKristof Szabados <Kristof.Szabados@ericsson.com>
parent ffac7a52
......@@ -337,10 +337,11 @@ public abstract class Expression_Value extends Value {
result = result.getReferencedSubValue(timestamp, reference, actualSubReference, refChain);
if (result != null && result.getIsErroneous(timestamp)) {
setIsErroneous(true);
return this;
}
}
return this;
return result;
}
/**
......
......@@ -9189,7 +9189,7 @@ public class AST_tests {
 
private ArrayList<MarkerToCheck> value_tests_ttcn_initializer() {
//value_tests.ttcn
ArrayList<MarkerToCheck> markersToCheck = new ArrayList<MarkerToCheck>(5297);
ArrayList<MarkerToCheck> markersToCheck = new ArrayList<MarkerToCheck>(5293);
int lineNum = 20;
markersToCheck.add(new MarkerToCheck("Value 1 is already assigned to `item1'", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Duplicate enumeration identifier `item2' was first declared here", ++lineNum, IMarker.SEVERITY_ERROR));
......@@ -10312,9 +10312,7 @@ public class AST_tests {
lineNum += 2;
markersToCheck.add(new MarkerToCheck("Invalid field reference `nonExi': type `@value_tests.t_altstep' does not have fields.", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid array element reference: type `@value_tests.t_altstep' can not be indexed", ++lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Type `@value_tests.t_altstep' can not be indexed", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid field reference `nonExi': type `@value_tests.t_altstep' does not have fields.", ++lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid reference: internal parameterisation is not supported", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid reference: internal parameterisation is not supported", ++lineNum, IMarker.SEVERITY_ERROR));
lineNum += 5;
markersToCheck.add(new MarkerToCheck("The default timer duration should be a float value", lineNum, IMarker.SEVERITY_ERROR));
lineNum += 5;
......@@ -10356,9 +10354,7 @@ public class AST_tests {
lineNum += 2;
markersToCheck.add(new MarkerToCheck("Invalid field reference `nonExi': type `@value_tests.t_testcase' does not have fields.", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid array element reference: type `@value_tests.t_testcase' can not be indexed", ++lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Type `@value_tests.t_testcase' can not be indexed", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid field reference `nonExi': type `@value_tests.t_testcase' does not have fields.", ++lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid reference: internal parameterisation is not supported", lineNum, IMarker.SEVERITY_ERROR));
markersToCheck.add(new MarkerToCheck("Invalid reference: internal parameterisation is not supported", ++lineNum, IMarker.SEVERITY_ERROR));
lineNum += 7;
for (i = 0; i < 11; i++) {
markersToCheck.add(new MarkerToCheck("NULL value was expected", lineNum++, IMarker.SEVERITY_ERROR));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment