Mercurial > hg > octave-nkf
view libinterp/parse-tree/token.cc @ 20638:7ac907da9fba
Use error() rather than ::error() unless explicitly required.
* resource-manager.cc (instance_ok), shortcut-manager.cc (instance_ok),
daspk.cc (DASPK_ABORT, DASPK_ABORT2), dasrt.cc (DASRT_ABORT, DASRT_ABORT2),
dassl.cc (DASSL_ABORT, DASSL_ABORT2), debug.cc (instance_ok),
display.cc (instance_ok), dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_dynamic_loader::instance_ok, do_load_oct, do_load_mex), file-io.cc
(fopen_mode_to_ios_mode, do_stream_open, Ffprintf, Fsprintf, Fscanf, Ffscanf,
get_sscanf_data, Fsscanf, do_fread, do_fwrite, Fpopen, Ftempname, convert,
Fumask), graphics.in.h (graphics_toolkit::instance_ok,
gh_manager::instance_ok), load-path.cc (instance_ok),
ls-oct-ascii.cc (save_three_d), lsode.cc (LSODE_ABORT, LSODE_ABORT2),
oct-errno.in.cc (instance_ok), octave-link.cc (connect_link),
pager.cc (octave_pager_stream::instance_ok, octave_diary_stream::instance_ok),
quad.cc (QUAD_ABORT, QUAD_ABORT2),
sighandlers.cc (w32_interrupt_manager::instance_ok,
octave_child_list::instance_ok), symtab.cc (do_update_nest),
symtab.h (instance_ok), syscalls.cc (convert), toplev.h (instance_ok),
txt-eng-ft.cc (instance_ok, set_mode), urlwrite.cc (instance_ok),
__init_fltk__.cc (instance_ok), ov-builtin.cc (do_multi_index_op),
ov-classdef.cc (class_fevalStatic, make_class, octave_classdef::subsasgn,
do_multi_index_op, cdef_object_array::subsref, cdef_object_array::subsasgn,
install_meth, meta_subsref, run_constructor, make_meta_class, get_value,
set_value, check_method), ov-classdef.h (meta_subsref, instance_ok),
ov-fcn-handle.cc (octave_fcn_handle), ov-mex-fcn.cc (do_multi_index_op),
ov-range.h (octave_range), ov-typeinfo.cc (instance_ok),
ov-usr-fcn.cc (subsref, do_multi_index_op), pt-arg-list.cc (Fend,
convert_to_const_vector), pt-cell.cc (rvalue1), pt-colon.cc (append, rvalue1),
pt-eval.cc (visit_simple_for_command, visit_switch_command),
pt-exp.cc (is_logically_true, rvalue), pt-id.cc (eval_undefined_error),
pt-id.h (workspace_error), pt-mat.cc (get_concat_class):
Use error() rather than ::error().
author | Rik <rik@octave.org> |
---|---|
date | Thu, 06 Aug 2015 08:09:01 -0700 |
parents | 734a77207e2e |
children |
line wrap: on
line source
/* Copyright (C) 1993-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cassert> #include "error.h" #include "oct-obj.h" #include "symtab.h" #include "token.h" #include "utils.h" token::token (int tv, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = generic_token; } token::token (int tv, bool is_kw, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = is_kw ? keyword_token : generic_token; } token::token (int tv, const char *s, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = string_token; str = new std::string (s); } token::token (int tv, const std::string& s, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = string_token; str = new std::string (s); } token::token (int tv, double d, const std::string& s, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = double_token; num = d; orig_text = s; } token::token (int tv, end_tok_type t, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = ettype_token; et = t; } token::token (int tv, symbol_table::symbol_record *s, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = sym_rec_token; sr = s; } token::token (int tv, const std::string& mth, const std::string& cls, int l, int c) { maybe_cmd = false; tspc = false; line_num = l; column_num = c; tok_val = tv; type_tag = scls_name_token; sc.method_nm = new std::string (mth); sc.class_nm = new std::string (cls); } token::~token (void) { if (type_tag == string_token) delete str; if (type_tag == scls_name_token) { delete sc.method_nm; delete sc.class_nm; } } std::string token::text (void) const { assert (type_tag == string_token); return *str; } std::string token::symbol_name (void) const { assert (type_tag == sym_rec_token); return sr->name (); } double token::number (void) const { assert (type_tag == double_token); return num; } token::token_type token::ttype (void) const { return type_tag; } token::end_tok_type token::ettype (void) const { assert (type_tag == ettype_token); return et; } symbol_table::symbol_record * token::sym_rec (void) { assert (type_tag == sym_rec_token); return sr; } std::string token::superclass_method_name (void) { assert (type_tag == scls_name_token); return *sc.method_nm; } std::string token::superclass_class_name (void) { assert (type_tag == scls_name_token); return *sc.class_nm; } std::string token::text_rep (void) { return orig_text; }