Mercurial > hg > octave-lyh
comparison libinterp/parse-tree/token.h @ 16155:0259254a3ccc classdef
maint: periodic merge of default to classdef
* lex.h, lex.ll, parse.h, oct-parse.yy: Resolve conflicts by adapting
classdef changes to new octave_parser and lexical_feedback classes.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 28 Feb 2013 02:04:24 -0500 |
| parents | 947cf10c94da ec9c6222ef5a |
| children | b28062b977fd |
comparison
equal
deleted
inserted
replaced
| 16050:fc3cb570ac46 | 16155:0259254a3ccc |
|---|---|
| 22 | 22 |
| 23 #if !defined (octave_token_h) | 23 #if !defined (octave_token_h) |
| 24 #define octave_token_h 1 | 24 #define octave_token_h 1 |
| 25 | 25 |
| 26 #include <string> | 26 #include <string> |
| 27 | |
| 28 #include "symtab.h" | |
| 27 | 29 |
| 28 class | 30 class |
| 29 token | 31 token |
| 30 { | 32 { |
| 31 public: | 33 public: |