Commit 1417b724 authored by baueko's avatar baueko

Merge remote-tracking branch 'origin/clemens' into konstantin2

Conflicts:
	CupParser/src/de/in/tum/www2/cup/Demo.java
parents f670dfec 4026d34d
......@@ -8,7 +8,7 @@ import de.in.tum.www2.cup.ast.ParserResult;
class Demo {
public static void main(String[] blah) throws Exception {
IErrorReporter er = new NoopErrorReporter();
IErrorReporter er = new NoOpErrorReporter();
FileInputStream input = new FileInputStream("E:/Dropbox/Studium/WiSe16/Praktikum/Testdateien/Input.cup");
CupParser parser = new CupParser(er, input);
CupParser.setClasspathEntries(createClasspath());
......@@ -18,7 +18,6 @@ class Demo {
public static String[] createClasspath() {
final String PATH_TO_JAVA_CUP_RUNTIME = "tools" + File.separator + "java-cup-11b-runtime.jar";
// final String PATH_TO_JAVA_LANG = "C:\\Program Files\\Java\\jre1.8.0_45\\lib\\rt.jar";
return new String[] { PATH_TO_JAVA_CUP_RUNTIME/* , PATH_TO_JAVA_LANG */ };
}
......
package de.in.tum.www2.cup;
public class NoopErrorReporter implements IErrorReporter
public class NoOpErrorReporter implements IErrorReporter
{
public void report(ErrorType type, ErrorSource source, ErrorCode errorCode,
String message, Position start, Position end)
......
......@@ -12,7 +12,7 @@ import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.widgets.Display;
import de.in.tum.www2.cup.CupParser;
import de.in.tum.www2.cup.NoopErrorReporter;
import de.in.tum.www2.cup.NoOpErrorReporter;
import de.in.tum.www2.cup.analysis.FindNextCodeBlockLineVisitor;
import de.in.tum.www2.cup.analysis.GetDebuggerMappingVisitor;
import de.in.tum.www2.cup.analysis.GetDebuggerMappingVisitor.Mapping;
......@@ -154,7 +154,7 @@ public class Debugger {
return selfBuiltAstCache;
InputStream in = new ByteArrayInputStream(document.get().getBytes());
CupParser parser = new CupParser(new NoopErrorReporter(), in);
CupParser parser = new CupParser(new NoOpErrorReporter(), in);
try {
CupParser.setClasspathEntries(PluginUtility.createClasspath());
selfBuiltAstCache = parser.parse();
......
......@@ -15,7 +15,7 @@ import org.eclipse.swt.SWT;
import de.in.tum.www2.cup.CupScanner;
import de.in.tum.www2.cup.CupSymbol;
import de.in.tum.www2.cup.Declarations;
import de.in.tum.www2.cup.NoopErrorReporter;
import de.in.tum.www2.cup.NoOpErrorReporter;
import de.in.tum.www2.cup.Position;
import de.in.tum.www2.cup.ast.AbstractNode;
import de.in.tum.www2.cup.ast.ActionCodeBlock;
......@@ -59,7 +59,7 @@ public class CupTokenScanner implements ITokenScanner {
StringReader reader = new StringReader(document.get().substring(
offset, offset + length));
scanner = new CupScanner(new NoopErrorReporter(), reader);
scanner = new CupScanner(new NoOpErrorReporter(), reader);
this.last = null;
this.offset = offset;
if(this.ast != null){}
......
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