diff options
Diffstat (limited to 'src/parser/antlr_line_buffered_input.cpp')
-rw-r--r-- | src/parser/antlr_line_buffered_input.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/parser/antlr_line_buffered_input.cpp b/src/parser/antlr_line_buffered_input.cpp index 1dd7c953c..bd4c910f9 100644 --- a/src/parser/antlr_line_buffered_input.cpp +++ b/src/parser/antlr_line_buffered_input.cpp @@ -341,25 +341,25 @@ pANTLR3_INPUT_STREAM antlr3LineBufferedStreamNew(std::istream& in, input->SetNewLineChar = bufferedInputSetNewLineChar; input->setUcaseLA = bufferedInputSetUcaseLA; -#ifndef CVC4_ANTLR3_OLD_INPUT_STREAM - // We have the data in memory now so we can deal with it according to - // the encoding scheme we were given by the user. - // - input->encoding = encoding; -#endif /* ! CVC4_ANTLR3_OLD_INPUT_STREAM */ +#ifndef CVC5_ANTLR3_OLD_INPUT_STREAM + // We have the data in memory now so we can deal with it according to + // the encoding scheme we were given by the user. + // + input->encoding = encoding; +#endif /* ! CVC5_ANTLR3_OLD_INPUT_STREAM */ - // Now we need to work out the endian type and install any - // API functions that differ from 8Bit - // - setupInputStream(input); + // Now we need to work out the endian type and install any + // API functions that differ from 8Bit + // + setupInputStream(input); - // Now we can set up the file name - // - input->istream->streamName = - input->strFactory->newStr8(input->strFactory, name); - input->fileName = input->istream->streamName; + // Now we can set up the file name + // + input->istream->streamName = + input->strFactory->newStr8(input->strFactory, name); + input->fileName = input->istream->streamName; - return input; + return input; } static pANTLR3_INPUT_STREAM antlr3CreateLineBufferedStream( @@ -391,16 +391,16 @@ static pANTLR3_INPUT_STREAM antlr3CreateLineBufferedStream( // Call the common 8 bit input stream handler // initialization. // -#ifdef CVC4_ANTLR3_OLD_INPUT_STREAM +#ifdef CVC5_ANTLR3_OLD_INPUT_STREAM antlr3AsciiSetupStream(input, ANTLR3_CHARSTREAM); -#else /* CVC4_ANTLR3_OLD_INPUT_STREAM */ +#else /* CVC5_ANTLR3_OLD_INPUT_STREAM */ antlr38BitSetupStream(input); // In some libantlr3c 3.4-beta versions, this call is not included in the // above. // This is probably an erroneously-deleted line in the libantlr3c source since // 3.2. antlr3GenericSetupStream(input); -#endif /* CVC4_ANTLR3_OLD_INPUT_STREAM */ +#endif /* CVC5_ANTLR3_OLD_INPUT_STREAM */ input->sizeBuf = 0; input->newlineChar = LineBuffer::NewLineChar; |