Skip to content
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

Replace C-style term type integer checks with TermType enum #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace C-style term type integer checks with TermType enum #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a891878
Replace C-style term type integer checks with TermType enum
Virtlink Jul 2, 2020
2280cdd
Rebuild spoofax-libs.jar
Virtlink Jul 2, 2020
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
4 changes: 2 additions & 2 deletions ...stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_EXT_at_end_1_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.*;
import static org.strategoxt.lang.Term.*;

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.ITermFactory;
import org.spoofax.interpreter.terms.TermType;

/**
* A stack-efficient version of the at-end strategy,
Expand All @@ -25,7 +25,7 @@ public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s)
//if (StackSaver.isNeededFor(context))
// new StackSaver(this).invokeStackFriendly(context, current, new Strategy[] { s }, NO_TERMS);

if (current.getTermType() != LIST)
if (current.getType() != TermType.LIST)
return null;

IStrategoList list = (IStrategoList) current;
Expand Down
7 changes: 3 additions & 4 deletions ...stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_EXT_concat_0_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.*;

import java.util.LinkedList;

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.ITermFactory;
import org.spoofax.interpreter.terms.TermType;

/**
* A stack-efficient version of the concat strategy, which concatenates
Expand All @@ -26,7 +25,7 @@ public class SRTS_EXT_concat_0_0 extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current) {
if (current.getTermType() != LIST) {
if (current.getType() != TermType.LIST) {
return null;
}
ITermFactory factory = context.getFactory();
Expand All @@ -36,7 +35,7 @@ public IStrategoTerm invoke(Context context, IStrategoTerm current) {
// Build a doubly linked list with the terms. O(n)
LinkedList<IStrategoTerm> tempList = new LinkedList<IStrategoTerm>();
for (IStrategoTerm t : list) {
if (t.getTermType() != LIST) {
if (t.getType() != TermType.LIST) {
// The term must be a list...
return null;
}
Expand Down
10 changes: 5 additions & 5 deletions ...atego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_EXT_fatal_err_0_3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.core.Tools.*;
import static org.spoofax.interpreter.terms.IStrategoTerm.*;

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;
import org.strategoxt.stratego_lib.concat_strings_0_0;

/**
Expand All @@ -15,16 +15,16 @@ public class SRTS_EXT_fatal_err_0_3 extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, IStrategoTerm message, IStrategoTerm term, IStrategoTerm trace) {
if (message.getTermType() == LIST)
if (message.getType() == TermType.LIST)
message = concat_strings_0_0.instance.invoke(context, message);
if (message == null || message.getTermType() != STRING)
if (message == null || message.getType() != TermType.STRING)
return null;

context.popOnExit(false);
if (term.getTermType() == TUPLE && term.getSubtermCount() == 0) {
if (term.getType() == TermType.TUPLE && term.getSubtermCount() == 0) {
throw new StrategoErrorExit(asJavaString(message));
} else {
if(trace.getTermType() == LIST){
if(trace.getType() == TermType.LIST){
throw new StrategoErrorExit(asJavaString(message), term, (IStrategoList) trace);
}else{
throw new StrategoErrorExit(asJavaString(message), term);
Expand Down
3 changes: 2 additions & 1 deletion ...stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_EXT_filter_1_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;

/**
* An implementation of filter(s), optimized for stack behavior
Expand All @@ -17,7 +18,7 @@ public class SRTS_EXT_filter_1_0 extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s) {
if (current.getTermType() != IStrategoTerm.LIST)
if (current.getType() != TermType.LIST)
return null;

IStrategoList list = (IStrategoList) current;
Expand Down
9 changes: 5 additions & 4 deletions ...go-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_EXT_flatten_list_0_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;
import org.strategoxt.lang.Context;
import org.strategoxt.lang.Strategy;

Expand All @@ -29,19 +30,19 @@ public class SRTS_EXT_flatten_list_0_0 extends Strategy {
@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current) {

if (current.getTermType() != IStrategoTerm.LIST) {
if (current.getType() != TermType.LIST) {
return null;
}

ArrayList<IStrategoTerm> newList = new ArrayList<IStrategoTerm>();
ArrayList<IStrategoTerm> stack = new ArrayList<IStrategoTerm>();
ArrayList<IStrategoTerm> newList = new ArrayList<>();
ArrayList<IStrategoTerm> stack = new ArrayList<>();

stack.add(current);

while (!stack.isEmpty()) {
current = stack.remove(stack.size() - 1);

if (current.getTermType() == IStrategoTerm.LIST) {
if (current.getType() == TermType.LIST) {
IStrategoList list = (IStrategoList)current;
final int oldsize = stack.size();
while (!list.isEmpty()) {
Expand Down
11 changes: 3 additions & 8 deletions strategoxt/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_all.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.*;

import org.spoofax.interpreter.terms.IStrategoAppl;
import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.IStrategoTuple;
import org.spoofax.interpreter.terms.*;

/**
* @author Lennart Kats <lennart add lclnet.nl>
Expand All @@ -15,9 +10,9 @@ public class SRTS_all extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s) {
int termType = current.getTermType();
TermType termType = current.getType();

if (termType == LIST) {
if (termType == TermType.LIST) {
IStrategoList list = (IStrategoList) current;
return mapMaintainAnnos(context, list, s, noAnnosTail(list));
} else {
Expand Down
7 changes: 3 additions & 4 deletions strategoxt/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_one.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.*;

import org.spoofax.interpreter.terms.IStrategoAppl;
import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.IStrategoTuple;
import org.spoofax.interpreter.terms.TermType;

/**
* @author Lennart Kats <lennart add lclnet.nl>
Expand All @@ -15,9 +14,9 @@ public class SRTS_one extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s) {
int termType = current.getTermType();
TermType termType = current.getType();

if (termType == LIST)
if (termType == TermType.LIST)
return fetchMaintainAnnos(context, (IStrategoList) current, s);

IStrategoTerm[] results = null;
Expand Down
7 changes: 3 additions & 4 deletions strategoxt/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/SRTS_some.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.*;

import org.spoofax.interpreter.terms.IStrategoAppl;
import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.IStrategoTuple;
import org.spoofax.interpreter.terms.TermType;

/**
* @author Lennart Kats <lennart add lclnet.nl>
Expand All @@ -15,9 +14,9 @@ public class SRTS_some extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s) {
int termType = current.getTermType();
TermType termType = current.getType();

if (termType == LIST) {
if (termType == TermType.LIST) {
final IStrategoList list = (IStrategoList) current;
return map1MaintainAnnos(context, list, s, false, SRTS_all.noAnnosTail(list));
}
Expand Down
3 changes: 2 additions & 1 deletion ...t/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/StrategoErrorExit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.spoofax.interpreter.core.Tools;
import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;

/**
* Exception thrown when the application exits with an fatal error message.
Expand Down Expand Up @@ -54,7 +55,7 @@ public String getLocalizedMessage() { // used for toString() and stacktraces
for(int i = 0; i < depth; i++) {
final IStrategoTerm t = trace.getSubterm(depth - i - 1);
sb.append("\n\t");
sb.append(t.getTermType() == IStrategoTerm.STRING ? Tools.asJavaString(t) : t);
sb.append(t.getType() == TermType.STRING ? Tools.asJavaString(t) : t);
}
}
return sb.toString();
Expand Down
5 changes: 3 additions & 2 deletions strategoxt/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/Term.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.ITermFactory;
import org.spoofax.interpreter.terms.TermType;
import org.spoofax.terms.TermFactory;

public class Term {
Expand All @@ -14,15 +15,15 @@ public class Term {
private Term() {}

public static IStrategoList checkListTail(IStrategoTerm t) {
if(t.getTermType() != IStrategoTerm.LIST) {
if(t.getType() != TermType.LIST) {
System.err.println("Warning: trying to build list with illegal tail: " + t.toString());
return null;
}
return (IStrategoList)t;
}

public static IStrategoList checkListAnnos(ITermFactory factory, IStrategoTerm annos) {
return annos.getTermType() != IStrategoTerm.LIST
return annos.getType() != TermType.LIST
? factory.makeList(annos)
: (IStrategoList) annos;
}
Expand Down
12 changes: 3 additions & 9 deletions ...xt/stratego-libraries/java-backend/java/runtime/org/strategoxt/lang/TermEqualityUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
package org.strategoxt.lang;

import static org.spoofax.interpreter.terms.IStrategoTerm.APPL;
import static org.spoofax.interpreter.terms.IStrategoTerm.BLOB;
import static org.spoofax.interpreter.terms.IStrategoTerm.INT;
import static org.spoofax.interpreter.terms.IStrategoTerm.LIST;
import static org.spoofax.interpreter.terms.IStrategoTerm.REAL;
import static org.spoofax.interpreter.terms.IStrategoTerm.STRING;
import static org.spoofax.interpreter.terms.IStrategoTerm.TUPLE;
import static org.strategoxt.lang.Term.NO_TERMS;

import org.spoofax.interpreter.terms.IStrategoAppl;
Expand All @@ -17,6 +10,7 @@
import org.spoofax.interpreter.terms.IStrategoString;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.ITermFactory;
import org.spoofax.interpreter.terms.TermType;

public class TermEqualityUtil {

Expand All @@ -30,8 +24,8 @@ public class TermEqualityUtil {
public static boolean equalsIgnoreAnnos(IStrategoTerm t1, IStrategoTerm t2, ITermFactory factory) {
if(t1 == t2)
return true;
int termType = t1.getTermType();
int type2 = t2.getTermType();
TermType termType = t1.getType();
TermType type2 = t2.getType();
if(termType != type2)
return false;

Expand Down
16 changes: 6 additions & 10 deletions ...libraries/java-backend/java/runtime/org/strategoxt/lang/compat/SSL_EXT_topdown_fputs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package org.strategoxt.lang.compat;

import static org.spoofax.interpreter.core.Tools.asJavaInt;
import static org.spoofax.interpreter.core.Tools.asJavaString;
import static org.spoofax.interpreter.terms.IStrategoTerm.APPL;
import static org.spoofax.interpreter.terms.IStrategoTerm.INT;
import static org.spoofax.interpreter.terms.IStrategoTerm.STRING;

import java.io.IOException;
import java.io.Writer;

Expand All @@ -14,6 +8,8 @@
import org.spoofax.interpreter.library.AbstractPrimitive;
import org.spoofax.interpreter.library.ssl.SSLLibrary;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;
import org.spoofax.terms.util.TermUtils;

/**
* @author Lennart Kats <lennart add lclnet.nl>
Expand All @@ -31,10 +27,10 @@ public boolean call(IContext env,

IStrategoTerm streamTerm = tvars[0];

if (streamTerm.getTermType() != APPL || streamTerm.getSubtermCount() != 1 || streamTerm.getSubterm(0).getTermType() != INT)
if (streamTerm.getType() != TermType.APPL || streamTerm.getSubtermCount() != 1 || streamTerm.getSubterm(0).getType() != TermType.INT)
return false;

int streamInt = asJavaInt(streamTerm.getSubterm(0));
int streamInt = TermUtils.toJavaIntAt(streamTerm, 0);

SSLLibrary or = SSLLibrary.instance(env);
Writer writer = or.getIOAgent().getWriter(streamInt);
Expand All @@ -54,8 +50,8 @@ public void invoke(IStrategoTerm tree, Writer writer) throws IOException {
IStrategoTerm child = tree.getSubterm(i);
if (child.getSubtermCount() > 0) {
invoke(child, writer);
} else if (child.getTermType() == STRING) {
writer.write(asJavaString(child));
} else if (child.getType() == TermType.STRING) {
writer.write(TermUtils.toJavaString(child));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...nd/java/runtime/org/strategoxt/lang/compat/stratego_rtg_compat/strrtg_list_loop1_1_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.spoofax.interpreter.terms.IStrategoList;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.interpreter.terms.TermType;
import org.strategoxt.lang.Context;
import org.strategoxt.lang.Strategy;

Expand All @@ -13,7 +14,7 @@ public class strrtg_list_loop1_1_0 extends Strategy {

@Override
public IStrategoTerm invoke(Context context, IStrategoTerm current, Strategy s) {
if (current.getTermType() != IStrategoTerm.LIST)
if (current.getType() != TermType.LIST)
return null;

boolean success = false;
Expand Down
2 changes: 0 additions & 2 deletions ...-libraries/java-backend/java/runtime/org/strategoxt/lang/compat/strc_compat/pp_c_0_0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package org.strategoxt.lang.compat.strc_compat;

import org.spoofax.interpreter.library.AbstractStrategoOperatorRegistry;
import org.spoofax.interpreter.terms.IStrategoTerm;
import org.spoofax.terms.util.NotImplementedException;
import org.strategoxt.lang.Context;
import org.strategoxt.lang.Strategy;
import org.strategoxt.lang.compat.StringValuePrimitive;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks unrelated to the PR. But I don't really care very much


/**
* @author Lennart Kats <lennart add lclnet.nl>
Expand Down
Loading