summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Estes <westes575@gmail.com>2021-06-08 11:11:28 -0400
committerWill Estes <westes575@gmail.com>2021-06-08 11:11:28 -0400
commit7b073fdda2242a8e4a0f70244c0ae83d34f099b1 (patch)
treeb514df8ffe2cd5d6b2b2c5431f6e75e833ff74c6
parentdada40b50f6b5121ce439245815216d52afb537e (diff)
parent60c4453b6ac1e29dbe039216ed948108eb9c6701 (diff)
downloadflex-git-7b073fdda2242a8e4a0f70244c0ae83d34f099b1.tar.gz
Merge branch 'yy-init-buffer-nonnull' of git://github.com/Explorer09/flex into Explorer09-yy-init-buffer-nonnull
-rw-r--r--src/c99-flex.skl2
-rw-r--r--src/cpp-flex.skl2
-rw-r--r--src/go-flex.skl2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/c99-flex.skl b/src/c99-flex.skl
index 08b143a..1e04afe 100644
--- a/src/c99-flex.skl
+++ b/src/c99-flex.skl
@@ -854,7 +854,7 @@ void yyrestart(FILE * input_file, yyscan_t yyscanner)
yy_create_buffer( yyscanner->yyin_r, YY_BUF_SIZE, yyscanner);
}
- yy_init_buffer( yy_current_buffer(yyscanner), input_file, yyscanner);
+ yy_init_buffer( yyscanner->yy_buffer_stack[yyscanner->yy_buffer_stack_top], input_file, yyscanner);
yy_load_buffer_state( yyscanner );
}
diff --git a/src/cpp-flex.skl b/src/cpp-flex.skl
index e33265d..1db0446 100644
--- a/src/cpp-flex.skl
+++ b/src/cpp-flex.skl
@@ -2831,7 +2831,7 @@ void yyFlexLexer::yyrestart( std::istream& input_file )
yy_create_buffer( yyin, YY_BUF_SIZE M4_YY_CALL_LAST_ARG);
}
- yy_init_buffer( yy_current_buffer(), input_file M4_YY_CALL_LAST_ARG);
+ yy_init_buffer( YY_CURRENT_BUFFER_LVALUE, input_file M4_YY_CALL_LAST_ARG);
yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
}
diff --git a/src/go-flex.skl b/src/go-flex.skl
index 39b3cd1..f2807dd 100644
--- a/src/go-flex.skl
+++ b/src/go-flex.skl
@@ -763,7 +763,7 @@ void yyrestart(FILE * input_file, FlexLexer *yyscanner)
yy_create_buffer(yyscanner->yyin, flexInputBufferSize, yyscanner);
}
- yy_init_buffer(yy_current_buffer(yyscanner), input_file, yyscanner);
+ yy_init_buffer(yyscanner->yyBufferStack[yyscanner->yyBufferStackTop], input_file, yyscanner);
yy_load_buffer_state(yyscanner);
}