X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginsh%2Fginsh_lexer.ll;h=cd35605c88cc0ddaffe0d03509158821e6e75028;hp=4194f94337af97e8ecfa155cee9c34a3c892ac61;hb=29b8244d6141ecb6f8d90480ade69af407270441;hpb=5302957e34e8afadc5e9a13cede439cea843bbf7 diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll index 4194f943..cd35605c 100644 --- a/ginsh/ginsh_lexer.ll +++ b/ginsh/ginsh_lexer.ll @@ -4,7 +4,7 @@ * This file must be processed with flex. */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,6 +26,8 @@ * Definitions */ +%pointer + %{ #include "config.h" @@ -37,6 +39,9 @@ // Table of all used symbols sym_tab syms; +// Type of symbols to generate (real or complex) +unsigned symboltype = domain::complex; + // lex input function static int ginsh_input(char *buf, int max_size); %} @@ -79,6 +84,8 @@ xyzzy return T_XYZZY; inventory return T_INVENTORY; look return T_LOOK; score return T_SCORE; +complex_symbols return T_COMPLEX_SYMBOLS; +real_symbols return T_REAL_SYMBOLS; /* comparison */ "==" return T_EQUAL; @@ -105,7 +112,15 @@ score return T_SCORE; {A}{AN}* { sym_tab::const_iterator i = syms.find(yytext); if (i == syms.end()) { - yylval = syms[yytext] = *(new symbol(yytext)); + if (symboltype == domain::complex) { + symbol tmp(yytext); + syms[yytext] = tmp; + yylval = tmp; + } else { + realsymbol tmp(yytext); + syms[yytext] = tmp; + yylval = tmp; + } } else yylval = i->second; return T_SYMBOL;