diff options
| -rw-r--r-- | etc/build.properties | 2 | ||||
| -rw-r--r-- | src/java/org/anarres/cpp/LexerSource.java | 2 | ||||
| -rw-r--r-- | src/java/org/anarres/cpp/Main.java | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/etc/build.properties b/etc/build.properties index 8d59b87..dad8db5 100644 --- a/etc/build.properties +++ b/etc/build.properties @@ -1,4 +1,4 @@ -global.version = 1.2.0 +global.version = 1.2.1 global.name = anarres-cpp global.dir.arch = ${global.dir.root}/arch diff --git a/src/java/org/anarres/cpp/LexerSource.java b/src/java/org/anarres/cpp/LexerSource.java index 8e679b5..c3ee982 100644 --- a/src/java/org/anarres/cpp/LexerSource.java +++ b/src/java/org/anarres/cpp/LexerSource.java @@ -509,7 +509,7 @@ public class LexerSource extends Source { if (ppvalid) { bol = true; if (include) { - tok = new Token(NL, _l, _c, new String("\n")); + tok = new Token(NL, _l, _c, "\n"); } else { int nls = 0; diff --git a/src/java/org/anarres/cpp/Main.java b/src/java/org/anarres/cpp/Main.java index e62ca83..e592169 100644 --- a/src/java/org/anarres/cpp/Main.java +++ b/src/java/org/anarres/cpp/Main.java @@ -165,7 +165,9 @@ public class Main { try { for (;;) { Token tok = pp.token(); - if (tok != null && tok.getType() == Token.EOF) + if (tok == null) + break; + if (tok.getType() == Token.EOF) break; System.out.print(tok.getText()); } @@ -302,6 +304,7 @@ public class Main { +#if (false) public static void oldmain(String[] args) throws Exception { List<String> path = new ArrayList<String>(); path.add("/usr/include"); @@ -372,5 +375,6 @@ public class Main { } } +#end } |