octave: src/parse.y comparison

comparison src/parse.y @ 3165:e4bbfc196e53

[project @ 1998-04-16 03:01:47 by jwe]

author	jwe
date	Thu, 16 Apr 1998 03:05:03 +0000
parents	7c96e85c76db
children	09a3064a3a17

comparison

equal deleted inserted replaced

-:45490c020e47
+:e4bbfc196e53
 subplot_list *subplot_list_type;
 plot_limits *plot_limits_type;
 plot_range *plot_range_type;
 subplot_using *subplot_using_type;
 subplot_style *subplot_style_type;
+subplot_axes *subplot_axes_type;
 octave_user_function *octave_user_function_type;
 }
 // Tokens with line and column information.
 %token <tok_val> '=' ':' '-' '+' '*' '/'
 %token <tok_val> NUM IMAG_NUM
 %token <tok_val> STRUCT_ELT
 %token <tok_val> NAME
 %token <tok_val> END
 %token <tok_val> PLOT
-%token <tok_val> TEXT STYLE
+%token <tok_val> TEXT STYLE AXES_TAG
 %token <tok_val> FOR WHILE
 %token <tok_val> IF ELSEIF ELSE
 %token <tok_val> SWITCH CASE OTHERWISE
 %token <tok_val> BREAK CONTINUE FUNC_RET
 %token <tok_val> UNWIND CLEANUP
 %token <tok_val> GLOBAL STATIC
 // Other tokens.
 %token END_OF_INPUT LEXICAL_ERROR
 %token FCN ELLIPSIS ALL_VA_ARGS
-%token USING TITLE WITH COLON OPEN_BRACE CLOSE_BRACE CLEAR
+%token USING TITLE WITH AXES COLON OPEN_BRACE CLOSE_BRACE CLEAR
 // Nonterminals we construct.
 %type <sep_type> sep_no_nl opt_sep_no_nl sep opt_sep
 %type <tree_type> input
 %type <tree_constant_type> constant magic_colon
 %type <subplot_list_type> plot_command1
 %type <plot_limits_type> ranges
 %type <plot_range_type> ranges1
 %type <subplot_using_type> using using1
 %type <subplot_style_type> style
+%type <subplot_axes_type> axes
 // Precedence and associativity.
 %left ';' ',' '\n'
 %right '=' ADD_EQ SUB_EQ MUL_EQ DIV_EQ EMUL_EQ EDIV_EQ OR_EQ AND_EQ LSHIFT_EQ RSHIFT_EQ
 %left EXPR_AND_AND EXPR_OR_OR
 		;
 plot_command2	: expression
 		  { $$ = new subplot ($1); }
 		| expression plot_options
-		  { $$ = $2->set_data ($1); }
+		  { $$ = $2->add_data ($1); }
 		;
 plot_options	: using
-		  { $$ = new subplot ($1, 0, 0); }
+		  {
+		    subplot *tmp = new subplot ();
+		    $$ = tmp->add_clause ($1);
+		  }
 		| title
-		  { $$ = new subplot (0, $1, 0); }
+		  {
+		    subplot *tmp = new subplot ();
+		    $$ = tmp->add_clause ($1);
+		  }
 		| style
-		  { $$ = new subplot (0, 0, $1); }
+		  {
-		| using title
+		    subplot *tmp = new subplot ();
-		  { $$ = new subplot ($1, $2, 0); }
+		    $$ = tmp->add_clause ($1);
-		| title using
+		  }
-		  { $$ = new subplot ($2, $1, 0); }
+		| axes
-		| using style
+		  {
-		  { $$ = new subplot ($1, 0, $2); }
+		    subplot *tmp = new subplot ();
-		| style using
+		    $$ = tmp->add_clause ($1);
-		  { $$ = new subplot ($2, 0, $1); }
+		  }
-		| title style
+		| plot_options using
-		  { $$ = new subplot (0, $1, $2); }
+		  {
-		| style title
+		    if (! ($$ = $1->add_clause ($2)))
-		  { $$ = new subplot (0, $2, $1); }
+		      {
-		| using title style
+			yyerror ("only one using option may be specified");
-		  { $$ = new subplot ($1, $2, $3); }
+			ABORT_PARSE;
-		| using style title
+		      }
-		  { $$ = new subplot ($1, $3, $2); }
+		  }
-		| title using style
+		| plot_options title
-		  { $$ = new subplot ($2, $1, $3); }
+		  {
-		| title style using
+		    if (! ($$ = $1->add_clause ($2)))
-		  { $$ = new subplot ($3, $1, $2); }
+		      {
-		| style using title
+			yyerror ("only one title option my be specified");
-		  { $$ = new subplot ($2, $3, $1); }
+			ABORT_PARSE;
-		| style title using
+		      }
-		  { $$ = new subplot ($3, $2, $1); }
+		  }
+		| plot_options style
+		  {
+		    if (! ($$ = $1->add_clause ($2)))
+		      {
+			yyerror ("only one style option my be specified");
+			ABORT_PARSE;
+		      }
+		  }
+		| plot_options axes
+		  {
+		    if (! ($$ = $1->add_clause ($2)))
+		      {
+			yyerror ("only one axes option may be specified");
+			ABORT_PARSE;
+		      }
+		  }
+		;
+axes		: AXES AXES_TAG
+		  {
+		    lexer_flags.in_plot_axes = false;
+		    $$ = new subplot_axes ($2->text ());
+		  }
 		;
 using		: using1
 		  {
 		    lexer_flags.in_plot_using = false;
 {
 command_editor::set_input_stream (static_cast<FILE *> (f));
 }
 static bool
-parse_fcn_file (bool exec_script, const string& ff)
+parse_fcn_file (const string& ff, bool exec_script, bool force_script = false)
 {
 unwind_protect::begin_frame ("parse_fcn_file");
 int script_file_executed = false;
 if (ffile)
 {
 // Check to see if this file defines a function or is just a
 // list of commands.
-if (is_function_file (ffile))
+if (! force_script && is_function_file (ffile))
 	{
 	  // XXX FIXME XXX -- we shouldn't need both the
 	  // command_history object and the
 	  // Vsaving_history variable...
 	  command_history::ignore_entries ();
 curr_fcn_file_name = nm;
 curr_fcn_file_full_name = ff;
 if (ff.length () > 0)
-	script_file_executed = parse_fcn_file (exec_script, ff);
+	script_file_executed = parse_fcn_file (ff, exec_script);
 if (! (error_state || script_file_executed))
 	force_link_to_function (nm);
 unwind_protect::run_frame ("load_fcn_from_file");
 if (! error_state)
 	{
 	  file = file_ops::tilde_expand (file);
-	  parse_fcn_file (true, file);
+	  parse_fcn_file (file, true, true);
 	  if (error_state)
 	    error ("source: error sourcing file `%s'", file.c_str ());
 	}
 else

Mercurial > octave

comparison src/parse.y @ 3165:e4bbfc196e53