commit | 2fd66ee70d20f86de789305b2972072776ba43a5 | [log] [tgz] |
---|---|---|
author | Jeffrey Overbey <jeffreyoverbey@acm.org> | Fri Jul 11 08:56:52 2014 -0500 |
committer | Jeffrey Overbey <jeffreyoverbey@acm.org> | Fri Jul 11 08:56:52 2014 -0500 |
tree | 6013a0de2ccc2f90d1bc92ab04f1eeda0fafd78b | |
parent | 83c816205bd04342b68fb6a9f2108da55d0fd46a [diff] | |
parent | deff3c68aaf6f30e8410b17277f0a299a4be9388 [diff] |
Merge branch 'ptp_8_0'
diff --git a/org.eclipse.photran.core.vpg/lexer/org/eclipse/photran/internal/core/lexer/preprocessor/fortran_include/PreprocessingFreeFormLexerPhase1.java b/org.eclipse.photran.core.vpg/lexer/org/eclipse/photran/internal/core/lexer/preprocessor/fortran_include/PreprocessingFreeFormLexerPhase1.java index 00f8920..443416f 100644 --- a/org.eclipse.photran.core.vpg/lexer/org/eclipse/photran/internal/core/lexer/preprocessor/fortran_include/PreprocessingFreeFormLexerPhase1.java +++ b/org.eclipse.photran.core.vpg/lexer/org/eclipse/photran/internal/core/lexer/preprocessor/fortran_include/PreprocessingFreeFormLexerPhase1.java
@@ -129,9 +129,4 @@ charsToTrim = Math.max(charsToTrim, 0); // TODO: Why does this go negative? token.setWhiteBefore(whiteBefore.substring(charsToTrim)); } - - @Override public void yypushback(int number) - { - throw new UnsupportedOperationException(); - } }