From c7fb7dfd794700bf6977a907a8612e9b644e4fe4 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 4 Jul 2016 21:53:55 +0200 Subject: o Improved parser. --- .../io/trygvis/ld/CollectingErrorListener.java | 17 +++++ .../src/main/java/io/trygvis/ld/LdScript.java | 73 +++++++++++++--------- .../java/io/trygvis/ld/StringGnuLdVisitor.java | 59 +++++++++++++++++ 3 files changed, 120 insertions(+), 29 deletions(-) create mode 100644 cmake/elfinfo/src/main/java/io/trygvis/ld/CollectingErrorListener.java create mode 100644 cmake/elfinfo/src/main/java/io/trygvis/ld/StringGnuLdVisitor.java (limited to 'cmake/elfinfo/src/main/java') diff --git a/cmake/elfinfo/src/main/java/io/trygvis/ld/CollectingErrorListener.java b/cmake/elfinfo/src/main/java/io/trygvis/ld/CollectingErrorListener.java new file mode 100644 index 0000000..968a02b --- /dev/null +++ b/cmake/elfinfo/src/main/java/io/trygvis/ld/CollectingErrorListener.java @@ -0,0 +1,17 @@ +package io.trygvis.ld; + +import org.antlr.v4.runtime.BaseErrorListener; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.Recognizer; + +import java.util.ArrayList; +import java.util.List; + +public class CollectingErrorListener extends BaseErrorListener { + public final List errors = new ArrayList<>(); + + public void syntaxError(Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) { + String s = line + ":" + charPositionInLine + " " + msg; + errors.add(s); + } +} diff --git a/cmake/elfinfo/src/main/java/io/trygvis/ld/LdScript.java b/cmake/elfinfo/src/main/java/io/trygvis/ld/LdScript.java index f827a8b..f3c93ac 100644 --- a/cmake/elfinfo/src/main/java/io/trygvis/ld/LdScript.java +++ b/cmake/elfinfo/src/main/java/io/trygvis/ld/LdScript.java @@ -1,12 +1,14 @@ package io.trygvis.ld; -import io.trygvis.ld.antlr.GnuLdBaseVisitor; import io.trygvis.ld.antlr.GnuLdLexer; import io.trygvis.ld.antlr.GnuLdParser; +import io.trygvis.ld.antlr.GnuLdParserBaseVisitor; import org.antlr.v4.runtime.ANTLRFileStream; import org.antlr.v4.runtime.BufferedTokenStream; +import org.antlr.v4.runtime.ConsoleErrorListener; import org.antlr.v4.runtime.tree.ParseTreeProperty; +import java.io.File; import java.math.BigInteger; import java.util.ArrayList; import java.util.HashSet; @@ -15,6 +17,12 @@ import java.util.Set; public class LdScript { + public final List memoryAreas; + + public LdScript(List memoryAreas) { + this.memoryAreas = memoryAreas; + } + public enum MemoryAttribute { R, W, X, A, I, } @@ -76,39 +84,31 @@ public class LdScript { String name; } - public static void main(String[] args) throws Exception { - try { - work(args); - } catch (Exception e) { - e.printStackTrace(System.out); - } - } - - private static void work(String[] args) throws Exception { - args = new String[]{"lds/d2000.ld"}; + public static LdScript parse(File path) throws Exception { + GnuLdLexer lexer = new GnuLdLexer(new ANTLRFileStream(path.getAbsolutePath())); + BufferedTokenStream tokens = new BufferedTokenStream(lexer); + GnuLdParser parser = new GnuLdParser(tokens); + parser.setBuildParseTree(true); + parser.removeErrorListeners(); + ConsoleErrorListener errorListener = new ConsoleErrorListener(); + parser.addErrorListener(errorListener); + CollectingErrorListener collectingErrorListener = new CollectingErrorListener(); + parser.addErrorListener(collectingErrorListener); - GnuLdLexer lexer = new GnuLdLexer(new ANTLRFileStream(args[0])); - GnuLdParser parser = new GnuLdParser(new BufferedTokenStream(lexer)); + GnuLdParser.FileContext file = parser.file(); -// ElfInfoGnuLdBaseListener listener = new ElfInfoGnuLdBaseListener(); -// parser.addParseListener(listener); -// -// parser.file(); -// -// for (Section section : listener.sections) { -// System.out.println("section.name = " + section.name); -// } + if (parser.getNumberOfSyntaxErrors() > 0) { + throw new ParseErrorException(lexer, tokens, parser, collectingErrorListener.errors + ); + } ElfinfoGnuLdBaseVisitor visitor = new ElfinfoGnuLdBaseVisitor(); - visitor.visit(parser.file()); + visitor.visit(file); - System.out.println("--------------------------------------------------------"); - for (MemoryArea area : visitor.memoryAreas) { - System.out.println(" " + area.name + "(" + area.prettyAttributes() + ") : ORIGIN = " + area.prettyOrigin() + ", LENGTH=" + area.prettyLength()); - } + return new LdScript(visitor.memoryAreas); } - private static class ElfinfoExprGnuLdBaseVisitor extends GnuLdBaseVisitor { + private static class ElfinfoExprGnuLdBaseVisitor extends GnuLdParserBaseVisitor { private BigInteger value; private ParseTreeProperty es = new ParseTreeProperty<>(); @@ -227,7 +227,7 @@ public class LdScript { } @Override - public ElfinfoExprGnuLdBaseVisitor visitExpAlign2(GnuLdParser.ExpAlign2Context ctx) { + public ElfinfoExprGnuLdBaseVisitor visitExpAlignK(GnuLdParser.ExpAlignKContext ctx) { return visitChildren(ctx); } @@ -416,7 +416,7 @@ public class LdScript { } } - private static class ElfinfoGnuLdBaseVisitor extends GnuLdBaseVisitor { + public static class ElfinfoGnuLdBaseVisitor extends GnuLdParserBaseVisitor { public List memoryAreas = new ArrayList<>(); public List
sections = new ArrayList<>(); @@ -473,6 +473,7 @@ public class LdScript { if (!attributes.isEmpty()) { throw new RuntimeException("Attributes for memory areas can only be attributesInverted (with '!') as the first character in a specification; foo(!rw), not foo(x!rw)."); } +// String name = ctx.name().getText(); String name = ctx.NAME().getText(); System.out.println("ctx.ATTRIBUTE().getText() = " + name); @@ -480,4 +481,18 @@ public class LdScript { return visitChildren(ctx); } } + + public static class ParseErrorException extends Exception { + public final GnuLdLexer lexer; + public final BufferedTokenStream tokens; + public final GnuLdParser parser; + public final List errors; + + public ParseErrorException(GnuLdLexer lexer, BufferedTokenStream tokens, GnuLdParser parser, List errors) { + this.lexer = lexer; + this.tokens = tokens; + this.parser = parser; + this.errors = errors; + } + } } diff --git a/cmake/elfinfo/src/main/java/io/trygvis/ld/StringGnuLdVisitor.java b/cmake/elfinfo/src/main/java/io/trygvis/ld/StringGnuLdVisitor.java new file mode 100644 index 0000000..a975497 --- /dev/null +++ b/cmake/elfinfo/src/main/java/io/trygvis/ld/StringGnuLdVisitor.java @@ -0,0 +1,59 @@ +package io.trygvis.ld; + +import io.trygvis.ld.antlr.GnuLdParserBaseVisitor; +import io.trygvis.ld.antlr.GnuLdParser; +import org.antlr.v4.runtime.tree.ParseTree; + +import java.util.List; + +class StringGnuLdVisitor extends GnuLdParserBaseVisitor { + +// public static String parseName(GnuLdParser.NameContext ctx) { +// return ""; +// } + + /* + public static String parseName(GnuLdParser.NameContext ctx) { + StringGnuLdVisitor v = new StringGnuLdVisitor(); + return v.visit(ctx); + } + + private StringBuilder string = new StringBuilder(); + + @Override + public String visitNamePlain(GnuLdParser.NamePlainContext ctx) { + System.out.println("NameTest.visitNamePlain"); + String s = ctx.NAME().getText(); + string.append(s); + return s; + } + +// @Override +// public String visitName_or_space(GnuLdParser.Name_or_spaceContext ctx) { +// System.out.println("StringGnuLdBaseVisitor.visitName_or_space"); +// +// TerminalNode name = ctx.NAME(); +// String s = name != null ? name.getText() : " "; +// string.append(s); +// return s; +// } + + @Override + public String visitNameQuoted(GnuLdParser.NameQuotedContext ctx) { + System.out.println("StringGnuLdBaseVisitor.visitNameQuoted"); + List children = ctx.children; + System.out.println("children.size()) = " + children.size()); + + String s = ""; + for (int i = 1; i < children.size() - 1; i++) { + ParseTree part = children.get(i); + System.out.println("part.getText() = " + part.getText()); + s += part.getText(); + } + + return s; +// +// return visitChildren(ctx); + } + */ +} -- cgit v1.2.3