Changed symbol_options to domain.

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 896c28d34a3ae38eb91fce11cd2b95eb619dfda9..15185d66a56b85c86813959c29f01f0871f4ef94 100644 (file)
--- 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 00aaea3e277eca841256471db8ae153835a5386f..c045826754f5dc2a4c6f9d0a2f7d0a47aec4852d 100644 (file)
--- 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) +