octave-avbm: src/parse.y comparison

comparison src/parse.y @ 191:b6b4d8c513fe

[project @ 1993-10-29 23:41:39 by jwe]

author	jwe
date	Fri, 29 Oct 1993 23:41:39 +0000
parents	aa5d189f5f07
children	13c6086c325c

comparison

equal deleted inserted replaced

-:edfb6cafe85d
+:b6b4d8c513fe
 %token <tok_val> NUM IMAG_NUM
 %token <tok_val> NAME SCREW
 %token <tok_val> END
 %token <tok_val> PLOT
 %token <tok_val> TEXT STYLE
+%token <tok_val> FOR WHILE IF ELSEIF ELSE BREAK CONTINUE FUNC_RET
 // Other tokens.
-%token FOR WHILE IF ELSEIF ELSE FCN BREAK CONTINUE FUNC_RET SCREW_TWO
+%token FCN SCREW_TWO
 %token END_OF_INPUT GLOBAL
 %token USING TITLE WITH COLON OPEN_BRACE CLOSE_BRACE
 // Nonterminals we construct.
 %type <tree_type> input command
 %type <tree_parameter_list_type> param_list param_list1 func_def1a
 %type <tree_word_list_type> word_list word_list1
 %type <tree_command_type> statement
 %type <tree_if_command_type> elseif
 %type <tree_command_list_type> simple_list simple_list1 list list1 opt_list
+%type <tree_command_list_type> global_decl global_decl1
 %type <tree_word_list_command_type> word_list_cmd
 %type <tree_plot_command_type> plot_command
 %type <tree_subplot_list_type> plot_command1 plot_command2 plot_options
 %type <tree_plot_limits_type> ranges
 %type <tree_plot_range_type> ranges1
 		| ans_expression
 		  { $$ = $1; }
 		| func_def
 		  { $$ = $1; }
 		| global_decl
-		  { $$ = NULL_TREE; }
+		  { $$ = $1; }
 		;
 plot_command	: PLOT plot_command1
 		  {
 		    tree_subplot_list *tmp = $2->reverse ();
 ans_expression	: expression
 		  { $$ = maybe_convert_to_ans_assign ($1); }
 		;
 global_decl	: GLOBAL global_decl1
-		  { }
+		  { $$ = $2->reverse (); }
 		;
 global_decl1	: NAME
-		  { force_global ($1->sym_rec()->name ()); }
+		  {
+		    force_global ($1->sym_rec()->name ());
+		    $$ = new tree_command_list ();
+		  }
 		| NAME '=' expression
 		  {
 		    symbol_record *sr = force_global ($1->sym_rec()->name ());
 		    tree_identifier *id = new tree_identifier
 		      (sr, $1->line (), $1->column ());
 		    tree_simple_assignment_expression *expr =
 		      new tree_simple_assignment_expression
 			(id, $3, $2->line (), $2->column ());
-		    expr->eval (0);
+		    $$ = new tree_command_list (expr);
 		  }
 		| global_decl1 optcomma NAME
-		  { force_global ($3->sym_rec()->name ()); }
+		  {
+		    force_global ($3->sym_rec()->name ());
+		    $$ = $1;
+		  }
 		| global_decl1 optcomma NAME '=' expression
 		  {
 		    symbol_record *sr = force_global ($3->sym_rec()->name ());
 		    tree_identifier *id = new tree_identifier
 		      (sr, $3->line (), $3->column ());
 		    tree_simple_assignment_expression *expr =
 		      new tree_simple_assignment_expression
 			(id, $5, $4->line (), $4->column ());
-		    expr->eval (0);
+		    $$ = $1->chain (expr);
 		  }
 		;
 optcomma	: // empty
 		| ','
 		  {
 		    maybe_warn_assign_as_truth_value ($2);
 		    if (check_end ($5, token::while_end))
 		      ABORT_PARSE;
 		    looping--;
-		    $$ = new tree_while_command ($2, $4);
+		    $$ = new tree_while_command ($2, $4, $1->line (),
+						 $1->column ());
 		  }
 		| FOR variable '=' expression optsep opt_list END
 		  {
 		    if (check_end ($7, token::for_end))
 		      ABORT_PARSE;
 		    looping--;
-		    $$ = new tree_for_command ($2, $4, $6);
+		    $$ = new tree_for_command ($2, $4, $6,
+					       $1->line (), $1->column ());
 		  }
 		| IF expression optsep opt_list END
 		  {
 		    maybe_warn_assign_as_truth_value ($2);
 		    if (check_end ($5, token::if_end))
 		      ABORT_PARSE;
 		    iffing--;
-		    $$ = new tree_if_command ($2, $4);
+		    $$ = new tree_if_command ($2, $4,
+					      $1->line (), $1->column ());
 		  }
 		| IF expression optsep opt_list ELSE optsep opt_list END
 		  {
 		    maybe_warn_assign_as_truth_value ($2);
 		    if (check_end ($8, token::if_end))
 		      ABORT_PARSE;
 		    iffing--;
-		    tree_if_command *t1 = new tree_if_command ($7);
+		    tree_if_command *t1 = new tree_if_command
-		    $$ = t1->chain ($2, $4);
+					    ($7, $5->line (), $5->column ());
+		    $$ = t1->chain ($2, $4, $1->line (), $1->column ());
 		  }
 		| IF expression optsep opt_list elseif END
 		  {
 		    maybe_warn_assign_as_truth_value ($2);
 		    if (check_end ($6, token::if_end))
 		      ABORT_PARSE;
 		    iffing--;
 		    tree_if_command *t1 = $5->reverse ();
 		    // Add the if list to the new head of the elseif
 		    // list, and return the list.
-		    $$ = t1->chain ($2, $4);
+		    $$ = t1->chain ($2, $4, $1->line (), $1->column ());
 		  }
 		| IF expression optsep opt_list elseif ELSE optsep opt_list END
 		  {
 		    maybe_warn_assign_as_truth_value ($2);
 		    if (check_end ($9, token::if_end))
 		      ABORT_PARSE;
 		    iffing--;
 		    // Add the else list to the head of the elseif list,
 		    // then reverse the list.
-		    tree_if_command *t1 = $5->chain ($8);
+		    tree_if_command *t1 = $5->chain ($8, $6->line (),
+						     $6->column ());
 		    t1 = t1->reverse ();
 		    // Add the if list to the new head of the elseif
 		    // list, and return the list.
-		    $$ = t1->chain ($2, $4);
+		    $$ = t1->chain ($2, $4, $1->line (), $1->column ());
 		  }
 		| BREAK
 		  {
 		    if (!looping)
 		      {
 			yyerror ("parse error");
 			error ("break: only meaningful within a `for'\
 or `while' loop");
 			ABORT_PARSE;
 		      }
-		    $$ = new tree_break_command ();
+		    $$ = new tree_break_command ($1->line (), $1->column ());
 		  }
 		| CONTINUE
 		  {
 		    if (!looping)
 		      {
 			yyerror ("parse error");
 			error ("continue: only meaningful within a\
 `for' or `while' loop");
 			ABORT_PARSE;
 		      }
-		    $$ = new tree_break_command ();
+		    $$ = new tree_continue_command ($1->line (),
+						    $1->column ());
 		  }
 		| FUNC_RET
 		  {
 		    if (!defining_func)
 		      {
 			yyerror ("parse error");
 			error ("return: only meaningful within a function");
 			ABORT_PARSE;
 		      }
-		    $$ = new tree_return_command ();
+		    $$ = new tree_return_command ($1->line (), $1->column ());
 		  }
 		;
 elseif		: ELSEIF optsep expression optsep opt_list
 		  {
 		    maybe_warn_assign_as_truth_value ($3);
-		    $$ = new tree_if_command ($3, $5);
+		    $$ = new tree_if_command ($3, $5, $1->line (),
+					      $1->column ());
 		  }
 		| elseif ELSEIF optsep expression optsep opt_list
 		  {
 		    maybe_warn_assign_as_truth_value ($4);
-		    $$ = $1->chain ($4, $6);
+		    $$ = $1->chain ($4, $6, $2->line (), $2->column ());
 		  }
 		;
 optsep		: // empty
 		| sep
 		      YYABORT;
 		  }
 		;
 variable	: identifier
-		  { $$ = new tree_index_expression ($1); }
+		  {
+		    $$ = new tree_index_expression
+			   ($1, $1->line (), $1->column ());
+		  }
 		| identifier '(' arg_list ')'
-		  { $$ = new tree_index_expression ($1, $3); }
+		  {
+		    $$ = new tree_index_expression
+			   ($1, $3, $1->line (), $1->column ());
+		  }
 		| identifier '(' ')'
 		  {
 		    $$ = new tree_index_expression
-			       ($1, (tree_argument_list *) NULL);
+		           ($1, (tree_argument_list *) NULL,
+			    $1->line (), $1->column ());
 		  }
 		| identifier '['
 		  {
 		    yyerror ("parse error");
 		    error ("use `(\' and `)\' as index operators, not\

Mercurial > hg > octave-avbm

comparison src/parse.y @ 191:b6b4d8c513fe