Mercurial > octave-nkf
comparison libinterp/parse-tree/token.cc @ 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 |
comparison
equal
deleted
inserted
replaced
19891:bf511802add7 | 19893:734a77207e2e |
---|---|
48 tspc = false; | 48 tspc = false; |
49 line_num = l; | 49 line_num = l; |
50 column_num = c; | 50 column_num = c; |
51 tok_val = tv; | 51 tok_val = tv; |
52 type_tag = is_kw ? keyword_token : generic_token; | 52 type_tag = is_kw ? keyword_token : generic_token; |
53 } | |
54 | |
55 token::token (int tv, const char *s, int l, int c) | |
56 { | |
57 maybe_cmd = false; | |
58 tspc = false; | |
59 line_num = l; | |
60 column_num = c; | |
61 tok_val = tv; | |
62 type_tag = string_token; | |
63 str = new std::string (s); | |
53 } | 64 } |
54 | 65 |
55 token::token (int tv, const std::string& s, int l, int c) | 66 token::token (int tv, const std::string& s, int l, int c) |
56 { | 67 { |
57 maybe_cmd = false; | 68 maybe_cmd = false; |