summaryrefslogtreecommitdiffstats
path: root/src/java/org/anarres/cpp
diff options
context:
space:
mode:
authorShevek <[email protected]>2008-05-08 20:36:53 +0000
committerShevek <[email protected]>2008-05-08 20:36:53 +0000
commit2fd08b3c9a83fddb3597be6ebf2626ec35fa088b (patch)
treef0bc3578e20c09d7c87583e2b0a585a40fe648ea /src/java/org/anarres/cpp
parenta8ba6b250bb73c2fa35400144a7bb038461161d0 (diff)
findbugs: nothing major
Diffstat (limited to 'src/java/org/anarres/cpp')
-rw-r--r--src/java/org/anarres/cpp/LexerSource.java2
-rw-r--r--src/java/org/anarres/cpp/Main.java6
2 files changed, 6 insertions, 2 deletions
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
}