comparison libinterp/corefcn/ls-mat-ascii.cc @ 22196:dd992fd74fce

put parser, lexer, and evaluator in namespace; interpreter now owns evaluator * oct-parse.in.yy, parse.h: Move parser classes to octave namespace. * lex.ll, lex.h: Move lexer classes to octave namespace. * pt-eval.h, pt-eval.cc: Move evaluator class to octave namespace. Don't define global current evaluator pointer here. * debug.cc, error.cc, input.cc, input.h, ls-mat-ascii.cc, pt-jit.cc, sighandlers.cc, utils.cc, variables.cc, ov-usr-fcn.cc, pt-assign.cc, pt-exp.h, pt-id.cc: Update for namespaces. * interpreter.cc, interpreter.h (current_evaluator): New global var. (interpreter::m_evaluator): New data member. (interpreter::~interpreter): Delete evaluator.
author John W. Eaton <jwe@octave.org>
date Tue, 12 Jul 2016 14:28:07 -0400
parents 9203833cab7d
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22195:93ed9396f2c3 22196:dd992fd74fce
253 char c = varname[i]; 253 char c = varname[i];
254 if (! (isalnum (c) || c == '_')) 254 if (! (isalnum (c) || c == '_'))
255 varname[i] = '_'; 255 varname[i] = '_';
256 } 256 }
257 257
258 if (is_keyword (varname) || ! isalpha (varname[0])) 258 if (octave::is_keyword (varname) || ! isalpha (varname[0]))
259 varname.insert (0, "X"); 259 varname.insert (0, "X");
260 260
261 if (! valid_identifier (varname)) 261 if (! valid_identifier (varname))
262 error ("load: unable to convert filename '%s' to valid identifier", 262 error ("load: unable to convert filename '%s' to valid identifier",
263 filename.c_str ()); 263 filename.c_str ());