From 356a2a11a46e43dc7b72526a2b64282d834fc1dd Mon Sep 17 00:00:00 2001
From: David Colignon <david.colignon@ulg.ac.be>
Date: Thu, 11 Jan 2001 16:34:38 +0000
Subject: [PATCH] *** empty log message ***
---
Makefile | 4 +-
Parser/Gmsh.tab.cpp | 16 ++++----
Parser/Gmsh.y | 10 ++---
Parser/Gmsh.yy.cpp | 92 +++++++++++++++------------------------------
4 files changed, 45 insertions(+), 77 deletions(-)
diff --git a/Makefile b/Makefile
index f0e18bc262..d92fc1c6bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 2001-01-11 16:00:28 colignon Exp $
+# $Id: Makefile,v 1.38 2001-01-11 16:34:38 colignon Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -139,7 +139,7 @@ gmshwin:
g++ -mno-cygwin -L/mingw/lib -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTKWIN_LIB) \
$(HOME)/SOURCES/fltk/lib/libfltk.a -lglu32 -lopengl32 -lgdi32 -lwsock32 -lm
gmshcygwin:
- g++ -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTKWIN_LIB) \
+ g++ -Wl,--subsystem,windows -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTKWIN_LIB) \
$(HOME)/SOURCES/fltk/lib/libfltk.a -lglu32 -lopengl32 -lgdi32 -lwsock32 -lm
gmsh4:
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 7fb463b036..6f7b604718 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -170,7 +170,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.61 2001-01-11 16:03:26 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.62 2001-01-11 16:34:38 colignon Exp $
#include <stdarg.h>
@@ -2500,7 +2500,7 @@ static const short yycheck[] = { 23,
166, 167, -1, -1, -1, -1, -1, 173, -1, 175
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/local/share/bison.simple"
+#line 3 "/usr/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2693,7 +2693,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
-#line 196 "/usr/local/share/bison.simple"
+#line 196 "/usr/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -4594,14 +4594,14 @@ case 203:
}
else if(!strcmp(yyvsp[-2].c, "Print")){
-
+#ifndef WIN32 // comprends pas pq ca ne marche pas
if(!CTX.interactive) CreateFile(yyvsp[-1].c, CTX.print.format);
-
+#endif
}
else if(!strcmp(yyvsp[-2].c, "Save")){
-
+#ifndef WIN32 // comprends pas pq ca ne marche pas
CreateFile(yyvsp[-1].c, CTX.mesh.format);
-
+#endif
}
else if(!strcmp(yyvsp[-2].c, "Merge")){
@@ -5871,7 +5871,7 @@ case 342:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/local/share/bison.simple"
+#line 498 "/usr/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 0c36b4315c..3ece8ba32f 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,6 @@
%{
-// $Id: Gmsh.y,v 1.54 2001-01-11 16:03:27 geuzaine Exp $
+// $Id: Gmsh.y,v 1.55 2001-01-11 16:34:38 colignon Exp $
#include <stdarg.h>
@@ -1629,14 +1629,14 @@ Command :
}
else if(!strcmp($1, "Print")){
-
+#ifndef WIN32 // comprends pas pq ca ne marche pas
if(!CTX.interactive) CreateFile($2, CTX.print.format);
-
+#endif
}
else if(!strcmp($1, "Save")){
-
+#ifndef WIN32 // comprends pas pq ca ne marche pas
CreateFile($2, CTX.mesh.format);
-
+#endif
}
else if(!strcmp($1, "Merge")){
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index d5f136c57f..0b90b48fb5 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.61 2001-01-11 16:03:27 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.62 2001-01-11 16:34:38 colignon Exp $
*/
#define FLEX_SCANNER
@@ -127,7 +127,6 @@ extern FILE *yyin, *yyout;
{ \
/* Undo effects of setting up yytext. */ \
*yy_cp = yy_hold_char; \
- YY_RESTORE_YY_MORE_OFFSET \
yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
@@ -237,7 +236,7 @@ void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *str ));
YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
@@ -971,13 +970,12 @@ static char *yy_last_accepting_cpos;
#define REJECT reject_used_but_not_detected
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
#line 1 "Gmsh.l"
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.61 2001-01-11 16:03:27 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.62 2001-01-11 16:34:38 colignon Exp $
#include <stdio.h>
#include <stdlib.h>
@@ -1020,7 +1018,7 @@ void skipline(void);
&& ferror( yyin ) ) \
YY_FATAL_ERROR( "input in flex scanner failed" );
-#line 1024 "Gmsh.yy.cpp"
+#line 1022 "Gmsh.yy.cpp"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -1042,10 +1040,6 @@ static void yyunput YY_PROTO(( int c, char *buf_ptr ));
static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
#endif
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput YY_PROTO(( void ));
@@ -1174,7 +1168,7 @@ YY_DECL
#line 63 "Gmsh.l"
-#line 1178 "Gmsh.yy.cpp"
+#line 1172 "Gmsh.yy.cpp"
if ( yy_init )
{
@@ -2148,7 +2142,7 @@ YY_RULE_SETUP
#line 273 "Gmsh.l"
ECHO;
YY_BREAK
-#line 2152 "Gmsh.yy.cpp"
+#line 2146 "Gmsh.yy.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2159,7 +2153,6 @@ case YY_STATE_EOF(INITIAL):
/* Undo the effects of YY_DO_BEFORE_ACTION. */
*yy_cp = yy_hold_char;
- YY_RESTORE_YY_MORE_OFFSET
if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
{
@@ -2305,7 +2298,7 @@ static int yy_get_next_buffer()
{ /* Don't try to fill the buffer, so this is an EOF. */
if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
{
- /* We matched a single character, the EOB, so
+ /* We matched a singled characater, the EOB, so
* treat this as a final EOF.
*/
return EOB_ACT_END_OF_FILE;
@@ -2332,7 +2325,7 @@ static int yy_get_next_buffer()
/* don't do the read, it's not guaranteed to return an EOF,
* just force an EOF
*/
- yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+ yy_n_chars = 0;
else
{
@@ -2387,8 +2380,6 @@ static int yy_get_next_buffer()
/* Read in more data. */
YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
yy_n_chars, num_to_read );
-
- yy_current_buffer->yy_n_chars = yy_n_chars;
}
if ( yy_n_chars == 0 )
@@ -2513,8 +2504,7 @@ register char *yy_bp;
yy_cp += (int) (dest - source);
yy_bp += (int) (dest - source);
- yy_current_buffer->yy_n_chars =
- yy_n_chars = yy_current_buffer->yy_buf_size;
+ yy_n_chars = yy_current_buffer->yy_buf_size;
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -2552,31 +2542,19 @@ static int input()
else
{ /* need more input */
- int offset = yy_c_buf_p - yytext_ptr;
+ yytext_ptr = yy_c_buf_p;
++yy_c_buf_p;
switch ( yy_get_next_buffer() )
{
- case EOB_ACT_LAST_MATCH:
- /* This happens because yy_g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- yyrestart( yyin );
-
- /* fall through */
-
case EOB_ACT_END_OF_FILE:
{
if ( yywrap() )
+ {
+ yy_c_buf_p =
+ yytext_ptr + YY_MORE_ADJ;
return EOF;
+ }
if ( ! yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
@@ -2588,8 +2566,17 @@ static int input()
}
case EOB_ACT_CONTINUE_SCAN:
- yy_c_buf_p = yytext_ptr + offset;
+ yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
break;
+
+ case EOB_ACT_LAST_MATCH:
+#ifdef __cplusplus
+ YY_FATAL_ERROR(
+ "unexpected last match in yyinput()" );
+#else
+ YY_FATAL_ERROR(
+ "unexpected last match in input()" );
+#endif
}
}
}
@@ -2753,9 +2740,6 @@ YY_BUFFER_STATE b;
#endif
{
- if ( ! b )
- return;
-
b->yy_n_chars = 0;
/* We always need two end-of-buffer characters. The first causes
@@ -2815,17 +2799,17 @@ yy_size_t size;
#ifndef YY_NO_SCAN_STRING
#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+YY_BUFFER_STATE yy_scan_string( yyconst char *str )
#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
+YY_BUFFER_STATE yy_scan_string( str )
+yyconst char *str;
#endif
{
int len;
- for ( len = 0; yy_str[len]; ++len )
+ for ( len = 0; str[len]; ++len )
;
- return yy_scan_bytes( yy_str, len );
+ return yy_scan_bytes( str, len );
}
#endif
@@ -2946,7 +2930,7 @@ char msg[];
{ \
/* Undo effects of setting up yytext. */ \
yytext[yyleng] = yy_hold_char; \
- yy_c_buf_p = yytext + n; \
+ yy_c_buf_p = yytext + n - YY_MORE_ADJ; \
yy_hold_char = *yy_c_buf_p; \
*yy_c_buf_p = '\0'; \
yyleng = n; \
@@ -2972,22 +2956,6 @@ int n;
}
#endif
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
- {
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
-
- return n;
- }
-#endif
-
#ifdef YY_USE_PROTOS
static void *yy_flex_alloc( yy_size_t size )
--
GitLab