Mercurial > octave

diff libinterp/corefcn/input.h @ 22196:dd992fd74fce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 0a4c5a90f286
children bac0d6f07a3e
line wrap: on
line diff
--- a/libinterp/corefcn/input.h	Mon Aug 01 09:52:51 2016 -0700
+++ b/libinterp/corefcn/input.h	Tue Jul 12 14:28:07 2016 -0400
@@ -36,7 +36,10 @@
 #include "pager.h"
 
 class octave_value;
-class octave_base_lexer;
+namespace octave
+{
+  class base_lexer;
+}
 
 extern OCTINTERP_API FILE *get_input_from_stdin (void);
 
@@ -89,7 +92,7 @@
 
   friend class octave_input_reader;
 
-  octave_base_reader (octave_base_lexer *lxr)
+  octave_base_reader (octave::base_lexer *lxr)
     : count (1), pflag (0), lexer (lxr)
   { }
 
@@ -138,7 +141,7 @@
 
   int pflag;
 
-  octave_base_lexer *lexer;
+  octave::base_lexer *lexer;
 
   void do_input_echo (const std::string&) const;
 
@@ -150,7 +153,7 @@
 {
 public:
 
-  octave_terminal_reader (octave_base_lexer *lxr = 0)
+  octave_terminal_reader (octave::base_lexer *lxr = 0)
     : octave_base_reader (lxr)
   { }
 
@@ -170,7 +173,7 @@
 {
 public:
 
-  octave_file_reader (FILE *f_arg, octave_base_lexer *lxr = 0)
+  octave_file_reader (FILE *f_arg, octave::base_lexer *lxr = 0)
     : octave_base_reader (lxr), file (f_arg) { }
 
   std::string get_input (bool& eof);
@@ -192,7 +195,7 @@
 public:
 
   octave_eval_string_reader (const std::string& str,
-                             octave_base_lexer *lxr = 0)
+                             octave::base_lexer *lxr = 0)
     : octave_base_reader (lxr), eval_string (str)
   { }
 
@@ -213,15 +216,15 @@
 octave_input_reader
 {
 public:
-  octave_input_reader (octave_base_lexer *lxr = 0)
+  octave_input_reader (octave::base_lexer *lxr = 0)
     : rep (new octave_terminal_reader (lxr))
   { }
 
-  octave_input_reader (FILE *file, octave_base_lexer *lxr = 0)
+  octave_input_reader (FILE *file, octave::base_lexer *lxr = 0)
     : rep (new octave_file_reader (file, lxr))
   { }
 
-  octave_input_reader (const std::string& str, octave_base_lexer *lxr = 0)
+  octave_input_reader (const std::string& str, octave::base_lexer *lxr = 0)
     : rep (new octave_eval_string_reader (str, lxr))
   { }