octave-nkf: libinterp/parse-tree/oct-parse.in.yy comparison

comparison libinterp/parse-tree/oct-parse.in.yy @ 17745:93b3d03b05e7 classdef

maint: periodic merge of default to classdef

author	John W. Eaton <jwe@octave.org>
date	Wed, 23 Oct 2013 22:29:06 -0400
parents	dc4124992f0c d63878346099
children	97e49b588f5d

comparison

equal deleted inserted replaced

-:dc4124992f0c
+:93b3d03b05e7
 /*
-Copyright (C) 1993-2012 John W. Eaton
+Copyright (C) 1993-2013 John W. Eaton
 Copyright (C) 2009 David Grundberg
 Copyright (C) 2009-2010 VZLU Prague
 This file is part of Octave.
 // Forward declarations for some functions defined at the bottom of
 // the file.
 static void yyerror (octave_base_parser& parser, const char *s);
-// Finish building a statement.
-template <class T>
-static tree_statement *
-make_statement (T *arg)
-{
-octave_comment_list *comment = octave_comment_buffer::get_comment ();
-return new tree_statement (arg, comment);
-}
 #define ABORT_PARSE \
 do \
 { \
 yyerrok; \
 if ((interactive || forced_interactive) \
 #define scanner lexer.scanner
 %}
 // Bison declarations.
+// The grammar currently has 14 shift/reduce conflicts.  Ensure that
+// we notice if that number changes.
+%expect 14
 // Don't add spaces around the = here; it causes some versions of
 // bison to fail to properly recognize the directive.
 %name-prefix="octave_"
 | list1 sep statement
 { $$ = parser.append_statement_list ($1, $2, $3, true); }
 ;
 statement       : expression
-{ $$ = make_statement ($1); }
+{ $$ = parser.make_statement ($1); }
 | command
-{ $$ = make_statement ($1); }
+{ $$ = parser.make_statement ($1); }
 | word_list_cmd
-{ $$ = make_statement ($1); }
+{ $$ = parser.make_statement ($1); }
 ;
 // =================
 // Word-list command
 // =================
 stmt_begin      : // empty
 { lexer.at_beginning_of_statement = true; }
 ;
 stash_comment   : // empty
-{ $$ = octave_comment_buffer::get_comment (); }
+{ $$ = lexer.get_comment (); }
 ;
 parse_error     : LEXICAL_ERROR
 { parser.bison_error ("parse error"); }
 | error
 delete stmt_list;
 delete &lexer;
 }
-void octave_base_parser::init (void)
-{
-LEXER = &lexer;
-}
 void
 octave_base_parser::reset (void)
 {
 endfunction_found = false;
 autoloading = false;
 {
 tree_command *retval = 0;
 if (end_token_ok (end_tok, token::unwind_protect_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = unwind_tok->line ();
 int c = unwind_tok->column ();
 retval = new tree_unwind_protect_command (body, cleanup_stmts,
 {
 tree_command *retval = 0;
 if (end_token_ok (end_tok, token::try_catch_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = try_tok->line ();
 int c = try_tok->column ();
 tree_identifier *id = 0;
 if (expr && expr->is_identifier ())
 {
 id = dynamic_cast<tree_identifier *> (expr);
 cleanup_stmts->pop_front ();
+stmt->set_expression (0);
+delete stmt;
 }
 }
 }
 retval = new tree_try_catch_command (body, cleanup_stmts, id,
 maybe_warn_assign_as_truth_value (expr);
 if (end_token_ok (end_tok, token::while_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 lexer.looping--;
 int l = while_tok->line ();
 int c = while_tok->column ();
 tree_expression *expr,
 octave_comment_list *lc)
 {
 maybe_warn_assign_as_truth_value (expr);
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 lexer.looping--;
 int l = until_tok->line ();
 int c = until_tok->column ();
 bool parfor = tok_id == PARFOR;
 if (end_token_ok (end_tok, parfor ? token::parfor_end : token::for_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 lexer.looping--;
 int l = for_tok->line ();
 int c = for_tok->column ();
 {
 tree_if_command *retval = 0;
 if (end_token_ok (end_tok, token::if_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = if_tok->line ();
 int c = if_tok->column ();
 if (list && ! list->empty ())
 {
 tree_switch_command *retval = 0;
 if (end_token_ok (end_tok, token::switch_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = switch_tok->line ();
 int c = switch_tok->column ();
 if (list && ! list->empty ())
 = new octave_user_function (lexer.symtab_context.curr_scope (),
 param_list, 0, body);
 if (fcn)
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 fcn->stash_trailing_comment (tc);
 fcn->stash_fcn_end_location (end_fcn_stmt->line (),
 end_fcn_stmt->column ());
 }
 if (nm != cls_name)
 bison_error ("invalid classdef definition, the class name must match the file name");
 else if (end_token_ok (end_tok, token::classdef_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = tok_val->line ();
 int c = tok_val->column ();
 retval = new tree_classdef (a, id, sc, body, lc, tc,
 {
 tree_classdef_properties_block *retval = 0;
 if (end_token_ok (end_tok, token::properties_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = tok_val->line ();
 int c = tok_val->column ();
 retval = new tree_classdef_properties_block (a, plist, lc, tc, l, c);
 {
 tree_classdef_methods_block *retval = 0;
 if (end_token_ok (end_tok, token::methods_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = tok_val->line ();
 int c = tok_val->column ();
 retval = new tree_classdef_methods_block (a, mlist, lc, tc, l, c);
 {
 tree_classdef_events_block *retval = 0;
 if (end_token_ok (end_tok, token::events_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = tok_val->line ();
 int c = tok_val->column ();
 retval = new tree_classdef_events_block (a, elist, lc, tc, l, c);
 {
 tree_classdef_enum_block *retval = 0;
 if (end_token_ok (end_tok, token::enumeration_end))
 {
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
+octave_comment_list *tc = lexer.comment_buf.get_comment ();
 int l = tok_val->line ();
 int c = tok_val->column ();
 retval = new tree_classdef_enum_block (a, elist, lc, tc, l, c);
 }
 return list;
 }
+// Finish building a statement.
+template <class T>
+tree_statement *
+octave_base_parser::make_statement (T *arg)
+{
+octave_comment_list *comment = lexer.get_comment ();
+return new tree_statement (arg, comment);
+}
 tree_statement_list *
 octave_base_parser::make_statement_list (tree_statement *stmt)
 {
 return new tree_statement_list (stmt);
 }
 void
 octave_push_parser::init (void)
 {
 parser_state = yypstate_new ();
-octave_base_parser::init ();
 }
 // Parse input from INPUT.  Pass TRUE for EOF if the end of INPUT should
 // finish the parse.
 }
 static void
 safe_fclose (FILE *f)
 {
-// FIXME -- comments at the end of an input file are
-// discarded (otherwise, they would be appended to the next
-// statement, possibly from the command line or another file, which
-// can be quite confusing).
-octave_comment_list *tc = octave_comment_buffer::get_comment ();
-delete tc;
 if (f)
 fclose (static_cast<FILE *> (f));
 }
 static octave_function *
 eval_string (const std::string& eval_str, bool silent,
 int& parse_status, int nargout)
 {
 octave_value_list retval;
-unwind_protect frame;
-// octave_base_parser constructor sets this for us.
-frame.protect_var (LEXER);
 octave_parser parser (eval_str);
 do
 {
 parser.reset ();
 parse_status = parser.run ();
-// Unmark forced variables.
-frame.run (1);
 if (parse_status == 0)
 {
 if (parser.stmt_list)
 {

Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/oct-parse.in.yy @ 17745:93b3d03b05e7 classdef