From 2cd9fa3637d936bf6bae9b29e38f47d3955ce158 Mon Sep 17 00:00:00 2001
From: Patrick Dular <patrick.dular@ulg.ac.be>
Date: Sat, 20 Feb 2016 16:59:10 +0000
Subject: [PATCH] Bug correction: correct treatment of C and C++ comments that
end with EOF (no line feed)
---
Parser/Gmsh.l | 9 +++++----
Parser/Gmsh.yy.cpp | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index f231edeb85..82053f304c 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -319,7 +319,8 @@ void skipcomments(void)
while (1) {
while ((c = yyinput()) != '*'){
- if(gmsheof(yyin)){
+ // Test on YY_END_OF_BUFFER_CHAR (0), not on gmsheof(yyin) because whole line in buffer
+ if(c=='\0'){
Msg::Error("End of file in commented region");
return;
}
@@ -364,9 +365,8 @@ char *strsave(char *ptr)
void skipline()
{
int c;
- while ((c = yyinput()) != '\n'){
- if(gmsheof(yyin)) return;
- }
+ while ((c = yyinput()) != '\n' && c!='\0') {}
+ // TODO: would be clever to skip the current buffer because whole line already in it
}
static bool is_alpha(const int c)
@@ -393,6 +393,7 @@ void skip_until(const char *skip, const char *until)
while(1){
while (1){
chars[0] = yyinput();
+ // TOFIX: do another test
if(gmsheof(yyin)){
Msg::Error("Unexpected end of file");
return;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 42f9e13240..b3a504af19 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -3482,7 +3482,8 @@ void skipcomments(void)
while (1) {
while ((c = yyinput()) != '*'){
- if(gmsheof(gmsh_yyin)){
+ // Test on YY_END_OF_BUFFER_CHAR (0), not on gmsheof(gmsh_yyin) because whole line in buffer
+ if(c=='\0'){
Msg::Error("End of file in commented region");
return;
}
@@ -3527,9 +3528,8 @@ char *strsave(char *ptr)
void skipline()
{
int c;
- while ((c = yyinput()) != '\n'){
- if(gmsheof(gmsh_yyin)) return;
- }
+ while ((c = yyinput()) != '\n' && c!='\0') {}
+ // TODO: would be clever to skip the current buffer because whole line already in it
}
static bool is_alpha(const int c)
@@ -3556,6 +3556,7 @@ void skip_until(const char *skip, const char *until)
while(1){
while (1){
chars[0] = yyinput();
+ // TOFIX: do another test
if(gmsheof(gmsh_yyin)){
Msg::Error("Unexpected end of file");
return;
--
GitLab