Skip to content

Rework integer literal parser #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eyck merged 4 commits into from
Nov 26, 2023
Merged

Rework integer literal parser #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e781226
add warning for assignments in control flow conditions
AtomCrafty Nov 11, 2023
e54825f
test: assignment condition warning
AtomCrafty Nov 11, 2023
ba53156
rewrite parsing logic for integer literals
AtomCrafty Nov 25, 2023
47e20be
test: integer literals
AtomCrafty Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions com.minres.coredsl.tests/src/com/minres/coredsl/tests/CoreDslTestCase.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,24 @@ class CoreDslTestCase<TRoot> {
return expectValue(isaName, findEObject(type, line), expectedValue);
}

def expectTypeAndValue(String isaName, EObject object, Object expectedType, Object expectedValue) {
semanticExpectations.add(new TypeExpectation(findIsa(isaName), object, String.valueOf(expectedType)));
semanticExpectations.add(new ValueExpectation(findIsa(isaName), object, String.valueOf(expectedValue)));
return this;
}

def expectTypeAndValue(String isaName, (TRoot)=>EObject objectLocator, Object expectedType, Object expectedValue) {
return expectTypeAndValue(isaName, objectLocator.apply(root), expectedType, expectedValue);
}

def expectTypeAndValue(String isaName, String declaratorName, Object expectedType, Object expectedValue) {
return expectTypeAndValue(isaName, findDeclarator(declaratorName), expectedType, expectedValue);
}

def expectTypeAndValue(String isaName, Class<? extends EObject> type, int line, Object expectedType, Object expectedValue) {
return expectTypeAndValue(isaName, findEObject(type, line), expectedType, expectedValue);
}

def private printProgram() {
val lines = newLinePattern.split(program);
val digits = String.valueOf(lines.length).length;
Expand Down Expand Up @@ -356,7 +374,7 @@ class CoreDslTestCase<TRoot> {
println(''' [OK] «description»''');
return true;
} else {
println(''' Expectation failed: «description»''');
println(''' [FAILED] «description»''');
return true;
}
} catch(Exception e) {
Expand All @@ -383,14 +401,14 @@ class CoreDslTestCase<TRoot> {
val description = object.shortDescription;

if(!ctx._isTypeSet(object)) {
println(''' «description»: Expected type «expectedType», but no type was set''');
println(''' [FAILED] «description»: Expected type «expectedType», but no type was set''');
return false;
}

val actualType = ctx._getType(object).toString();

if(actualType != expectedType) {
println(''' «description»: Expected type «expectedType», but got «actualType»''');
println(''' [FAILED] «description»: Expected type «expectedType», but got «actualType»''');
return false;
}

Expand Down Expand Up @@ -420,14 +438,14 @@ class CoreDslTestCase<TRoot> {
val description = object.shortDescription;

if(!ctx._isValueSet(object)) {
println(''' «description»: Expected value «expectedValue», but no value was set''');
println(''' [FAILED] «description»: Expected value «expectedValue», but no value was set''');
return false;
}

val actualValue = ctx._getValue(object).toString();

if(actualValue != expectedValue) {
println(''' «description»: Expected value «expectedValue», but got «actualValue»''');
println(''' [FAILED] «description»: Expected value «expectedValue», but got «actualValue»''');
return false;
}

Expand Down
Loading