Mercurial > octave-nkf

comparison src/lex.l @ 2926:66ef74ee5d9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-05-05 03:20:52 by jwe]
author jwe
date Mon, 05 May 1997 03:40:21 +0000
parents 5ed088015839
children b9e64477f703
comparison
equal deleted inserted replaced
2925:f0665dac8e33 2926:66ef74ee5d9f
34 #include <string> 34 #include <string>
35 35
36 #include <strstream.h> 36 #include <strstream.h>
37 37
38 #include "SLStack.h" 38 #include "SLStack.h"
39
40 #include "cmd-edit.h"
39 41
40 // These would be alphabetical, but y.tab.h must be included before 42 // These would be alphabetical, but y.tab.h must be included before
41 // oct-gperf.h and y.tab.h must be included after token.h and the tree 43 // oct-gperf.h and y.tab.h must be included after token.h and the tree
42 // class declarations. We can't include y.tab.h in oct-gperf.h 44 // class declarations. We can't include y.tab.h in oct-gperf.h
43 // because it may not be protected to allow it to be included multiple 45 // because it may not be protected to allow it to be included multiple
699 701
700 // Can be reset by defining a function. 702 // Can be reset by defining a function.
701 if (! (reading_script_file || reading_fcn_file)) 703 if (! (reading_script_file || reading_fcn_file))
702 { 704 {
703 current_input_column = 1; 705 current_input_column = 1;
704 input_line_number = current_command_number - 1; 706 input_line_number = command_editor::current_command_number () - 1;
705 } 707 }
706 708
707 // Only ask for input from stdin if we are expecting interactive 709 // Only ask for input from stdin if we are expecting interactive
708 // input. 710 // input.
709 if (interactive && ! (reading_fcn_file || get_input_from_eval_string)) 711 if (interactive && ! (reading_fcn_file || get_input_from_eval_string))