Mercurial > octave-nkf

comparison libinterp/parse-tree/lex.ll @ 16211:3449bf257514 classdef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: fix botched merge of default to classdef
author John W. Eaton <jwe@octave.org>
date Thu, 07 Mar 2013 10:23:02 -0500
parents a8f9eb92fa6e
children d2b268936783
comparison
equal deleted inserted replaced
16205:a8f9eb92fa6e 16211:3449bf257514
44 } 44 }
45 45
46 %s COMMAND_START 46 %s COMMAND_START
47 %s MATRIX_START 47 %s MATRIX_START
48 48
49 <<<<<<< local
50 %x SCRIPT_FILE_BEGIN
51 %x FUNCTION_FILE_BEGIN
52 %x CLASSDEF_FILE_BEGIN
53 =======
54 %x INPUT_FILE_BEGIN 49 %x INPUT_FILE_BEGIN
55 >>>>>>> other
56 50
57 %{ 51 %{
58 52
59 #include <cctype> 53 #include <cctype>
60 #include <cstring> 54 #include <cstring>
274 // May be reset later if we see "function" or "classdef" appears 268 // May be reset later if we see "function" or "classdef" appears
275 // as the first token. 269 // as the first token.
276 curr_lexer->reading_script_file = true; 270 curr_lexer->reading_script_file = true;
277 271
278 DISPLAY_TOK_AND_RETURN (INPUT_FILE); 272 DISPLAY_TOK_AND_RETURN (INPUT_FILE);
279 }
280
281 <CLASSDEF_FILE_BEGIN>. {
282 LEXER_DEBUG ("<CLASSDEF_FILE_BEGIN>.");
283
284 BEGIN (INITIAL);
285 curr_lexer->xunput (yytext[0], yytext);
286 COUNT_TOK_AND_RETURN (CLASSDEF_FILE);
287 } 273 }
288 274
289 %{ 275 %{
290 // Help and other command-style functions. 276 // Help and other command-style functions.
291 %} 277 %}
1333 looking_at_initializer_expression = false; 1319 looking_at_initializer_expression = false;
1334 looking_at_matrix_or_assign_lhs = false; 1320 looking_at_matrix_or_assign_lhs = false;
1335 looking_for_object_index = false; 1321 looking_for_object_index = false;
1336 looking_at_indirect_ref = false; 1322 looking_at_indirect_ref = false;
1337 parsing_class_method = false; 1323 parsing_class_method = false;
1324 parsing_classdef = false;
1338 maybe_classdef_get_set_method = false; 1325 maybe_classdef_get_set_method = false;
1339 parsing_classdef = false; 1326 parsing_classdef_get_method = false;
1327 parsing_classdef_set_method = false;
1340 quote_is_transpose = false; 1328 quote_is_transpose = false;
1341 force_script = false; 1329 force_script = false;
1342 reading_fcn_file = false; 1330 reading_fcn_file = false;
1343 reading_script_file = false; 1331 reading_script_file = false;
1344 reading_classdef_file = false; 1332 reading_classdef_file = false;
1478 void 1466 void
1479 octave_lexer::prep_for_file (void) 1467 octave_lexer::prep_for_file (void)
1480 { 1468 {
1481 OCTAVE_YYG; 1469 OCTAVE_YYG;
1482 1470
1483 reading_script_file = true;
1484
1485 BEGIN (INPUT_FILE_BEGIN); 1471 BEGIN (INPUT_FILE_BEGIN);
1486 } 1472 }
1487 1473
1488 int 1474 int
1489 octave_lexer::read (char *buf, unsigned max_size) 1475 octave_lexer::read (char *buf, unsigned max_size)
1490 { 1476 {
1491 <<<<<<< local
1492 OCTAVE_YYG;
1493
1494 BEGIN (FUNCTION_FILE_BEGIN);
1495 }
1496
1497 void
1498 lexical_feedback::prep_for_classdef_file (void)
1499 {
1500 OCTAVE_YYG;
1501
1502 BEGIN (CLASSDEF_FILE_BEGIN);
1503 }
1504
1505 int
1506 lexical_feedback::octave_read (char *buf, unsigned max_size)
1507 {
1508 static const char * const eol = "\n";
1509 static std::string input_buf;
1510 static const char *pos = 0;
1511 static size_t chars_left = 0;
1512 static bool eof = false;
1513
1514 =======
1515 >>>>>>> other
1516 int status = 0; 1477 int status = 0;
1517 1478
1518 if (input_buf.empty ()) 1479 if (input_buf.empty ())
1519 { 1480 {
1520 bool eof = false; 1481 bool eof = false;
3763 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break; 3724 case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break;
3764 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break; 3725 case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break;
3765 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break; 3726 case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break;
3766 case FCN: std::cerr << "FCN\n"; break; 3727 case FCN: std::cerr << "FCN\n"; break;
3767 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break; 3728 case CLOSE_BRACE: std::cerr << "CLOSE_BRACE\n"; break;
3768 <<<<<<< local
3769 case SCRIPT_FILE: std::cerr << "SCRIPT_FILE\n"; break;
3770 case FUNCTION_FILE: std::cerr << "FUNCTION_FILE\n"; break;
3771 case CLASSDEF_FILE: std::cerr << "CLASSDEF_FILE\n"; break;
3772 =======
3773 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break; 3729 case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break;
3774 >>>>>>> other
3775 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break; 3730 case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break;
3776 case METAQUERY: std::cerr << "METAQUERY\n"; break; 3731 case METAQUERY: std::cerr << "METAQUERY\n"; break;
3777 case GET: std::cerr << "GET\n"; break; 3732 case GET: std::cerr << "GET\n"; break;
3778 case SET: std::cerr << "SET\n"; break; 3733 case SET: std::cerr << "SET\n"; break;
3779 case PROPERTIES: std::cerr << "PROPERTIES\n"; break; 3734 case PROPERTIES: std::cerr << "PROPERTIES\n"; break;
3815 3770
3816 case INPUT_FILE_BEGIN: 3771 case INPUT_FILE_BEGIN:
3817 std::cerr << "INPUT_FILE_BEGIN" << std::endl; 3772 std::cerr << "INPUT_FILE_BEGIN" << std::endl;
3818 break; 3773 break;
3819 3774
3820 case CLASSDEF_FILE_BEGIN:
3821 std::cerr << "CLASSDEF_FILE_BEGIN" << std::endl;
3822 break;
3823
3824 default: 3775 default:
3825 std::cerr << "UNKNOWN START STATE!" << std::endl; 3776 std::cerr << "UNKNOWN START STATE!" << std::endl;
3826 break; 3777 break;
3827 } 3778 }
3828 } 3779 }