From 0e1c79a27b0567d8b9f5110b3a42647a71085aec Mon Sep 17 00:00:00 2001 From: Christian Bauer Date: Mon, 21 Feb 2005 19:36:43 +0000 Subject: [PATCH] remove dependence on YYTEXT_POINTER which is not being defined when lex is missing; explicitly request a %pointer instead --- ginac/input_lexer.h | 4 ---- ginac/input_lexer.ll | 2 ++ ginsh/ginsh.h | 4 ---- ginsh/ginsh_lexer.ll | 2 ++ 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ginac/input_lexer.h b/ginac/input_lexer.h index a01bc5d5..c3d154e3 100644 --- a/ginac/input_lexer.h +++ b/ginac/input_lexer.h @@ -37,11 +37,7 @@ extern "C" { extern int ginac_yyerror(char *s); extern int ginac_yylex(void); extern void ginac_yyrestart(FILE *f); -#if YYTEXT_POINTER extern char *ginac_yytext; -#else -extern char ginac_yytext[]; -#endif namespace GiNaC { diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll index 4be043a5..9098b4f9 100644 --- a/ginac/input_lexer.ll +++ b/ginac/input_lexer.ll @@ -26,6 +26,8 @@ * Definitions */ +%pointer + %{ #include #include diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h index a7ec33dc..24d17a12 100644 --- a/ginsh/ginsh.h +++ b/ginsh/ginsh.h @@ -58,11 +58,7 @@ using namespace GiNaC; // lex functions/variables extern int yyerror(char *s); extern int yylex(void); -#if YYTEXT_POINTER extern char *yytext; -#else -extern char yytext[]; -#endif extern FILE *yyin; // List of input files to be processed diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll index 15185d66..09765dfe 100644 --- a/ginsh/ginsh_lexer.ll +++ b/ginsh/ginsh_lexer.ll @@ -26,6 +26,8 @@ * Definitions */ +%pointer + %{ #include "config.h" -- 2.44.0