From: Jens Vollinga Date: Thu, 8 Jan 2004 18:53:36 +0000 (+0000) Subject: Changed symbol_options to domain. X-Git-Tag: release_1-2-0~21 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=5b39fbbac3cb187af4c09146d11e7cc602be666b;hp=3c75f4ed241bb89f09fd27b9ec6cd7bd240c2cda Changed symbol_options to domain. --- diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll index 896c28d3..15185d66 100644 --- a/ginsh/ginsh_lexer.ll +++ b/ginsh/ginsh_lexer.ll @@ -38,7 +38,7 @@ sym_tab syms; // Type of symbols to generate (real or complex) -unsigned symboltype = symbol_options::complex; +unsigned symboltype = domain::complex; // lex input function static int ginsh_input(char *buf, int max_size); @@ -110,10 +110,10 @@ real_symbols return T_REAL_SYMBOLS; {A}{AN}* { sym_tab::const_iterator i = syms.find(yytext); if (i == syms.end()) { - if (symboltype == symbol_options::complex) { + if (symboltype == domain::complex) { yylval = syms[yytext] = *(new symbol(yytext)); } else { - yylval = syms[yytext] = *(new symbol(yytext, symbol_options::real)); + yylval = syms[yytext] = *(new symbol(yytext, domain::real)); } } else yylval = i->second; diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy index 00aaea3e..c0458267 100644 --- a/ginsh/ginsh_parser.yy +++ b/ginsh/ginsh_parser.yy @@ -202,8 +202,8 @@ line : ';' cout << (syms.size() > 350 ? 350 : syms.size()); cout << " out of a possible 350.\n"; } - | T_REAL_SYMBOLS { symboltype = symbol_options::real; } - | T_COMPLEX_SYMBOLS { symboltype = symbol_options::complex; } + | T_REAL_SYMBOLS { symboltype = domain::real; } + | T_COMPLEX_SYMBOLS { symboltype = domain::complex; } | T_TIME {getrusage(RUSAGE_SELF, &start_time);} '(' exp ')' { getrusage(RUSAGE_SELF, &end_time); cout << (end_time.ru_utime.tv_sec - start_time.ru_utime.tv_sec) +