comparison libinterp/parse-tree/token.h @ 19893:734a77207e2e

maint: Periodic merge of stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 25 Feb 2015 12:04:01 -0500
parents 4197fc428c7d 77f65eabac20
children 8aa424ffc076
comparison
equal deleted inserted replaced
19891:bf511802add7 19893:734a77207e2e
61 unwind_protect_end 61 unwind_protect_end
62 }; 62 };
63 63
64 token (int tv, int l = -1, int c = -1); 64 token (int tv, int l = -1, int c = -1);
65 token (int tv, bool is_keyword, int l = -1, int c = -1); 65 token (int tv, bool is_keyword, int l = -1, int c = -1);
66 token (int tv, const char *s, int l = -1, int c = -1);
66 token (int tv, const std::string& s, int l = -1, int c = -1); 67 token (int tv, const std::string& s, int l = -1, int c = -1);
67 token (int tv, double d, const std::string& s = std::string (), 68 token (int tv, double d, const std::string& s = std::string (),
68 int l = -1, int c = -1); 69 int l = -1, int c = -1);
69 token (int tv, end_tok_type t, int l = -1, int c = -1); 70 token (int tv, end_tok_type t, int l = -1, int c = -1);
70 token (int tv, symbol_table::symbol_record *s, int l = -1, int c = -1); 71 token (int tv, symbol_table::symbol_record *s, int l = -1, int c = -1);