Changeset 559
- Timestamp:
- 06/21/08 06:10:17 (5 months ago)
- Files:
-
- trunk/rphp/compiler/parser/php.g (modified) (7 diffs)
- trunk/rphp/compiler/parser/rphp_ast.h (modified) (99 diffs)
- trunk/rphp/compiler/parser/rphp_default_visitor.h (modified) (1 diff)
- trunk/rphp/compiler/parser/rphp_parser.cpp (modified) (5 diffs)
- trunk/rphp/compiler/parser/rphp_parser.h (modified) (1 diff)
- trunk/rphp/compiler/parser/rphp_visitor.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/rphp/compiler/parser/php.g
r557 r559 23 23 [: 24 24 25 namespace RPHP25 namespace rphp 26 26 { 27 27 class Lexer; … … 37 37 -- Export macro to use the parser in a shared lib 38 38 ------------------------------------------------------------ 39 %export_macro "KDEVPHPPARSER_EXPORT"40 %export_macro_header "parserexport.h"41 39 42 40 ------------------------------------------------------------ … … 623 621 624 622 625 LNUMBER [: (*yynode)->numType = Php::LongNumber; :]626 | DNUMBER [: (*yynode)->numType = Php::DoubleNumber; :]623 LNUMBER [: (*yynode)->numType = rphp::LongNumber; :] 624 | DNUMBER [: (*yynode)->numType = rphp::DoubleNumber; :] 627 625 | CONSTANT_ENCAPSED_STRING 628 626 | LINE … … 632 630 | FUNC_C 633 631 -> commonScalar [ 634 member variable numType: Php::NumericType; ] ;;632 member variable numType: rphp::NumericType; ] ;; 635 633 636 634 FUNCTION (BIT_AND | 0) STRING … … 709 707 [: 710 708 #include "phplexer.h" 711 #include <QtCore/QDebug> 712 713 namespace Php 709 710 namespace rphp 714 711 { 715 712 … … 751 748 { 752 749 if (type == Error) 753 qDebug()<< "** ERROR:" << message;750 cout << "** ERROR:" << message; 754 751 else if (type == Warning) 755 qDebug()<< "** WARNING:" << message;752 cout << "** WARNING:" << message; 756 753 else if (type == Info) 757 qDebug()<< "** Info:" << message;754 cout << "** Info:" << message; 758 755 } 759 756 … … 806 803 } 807 804 808 } // end of namespace Php805 } // end of namespace rphp 809 806 810 807 :] trunk/rphp/compiler/parser/rphp_ast.h
r557 r559 7 7 #include <kdev-pg-list.h> 8 8 9 #include <parserexport.h> 10 11 12 namespace RPHP 9 10 11 namespace rphp 13 12 { 14 13 … … 218 217 219 218 220 struct KDEVPHPPARSER_EXPORTast_node219 struct ast_node 221 220 { 222 221 enum ast_node_kind_enum { … … 326 325 }; 327 326 328 struct KDEVPHPPARSER_EXPORTadditiveExpression_ast: public ast_node327 struct additiveExpression_ast: public ast_node 329 328 { 330 329 enum … … 337 336 }; 338 337 339 struct KDEVPHPPARSER_EXPORTadditiveExpressionRest_ast: public ast_node338 struct additiveExpressionRest_ast: public ast_node 340 339 { 341 340 enum … … 347 346 }; 348 347 349 struct KDEVPHPPARSER_EXPORTarrayPairValue_ast: public ast_node348 struct arrayPairValue_ast: public ast_node 350 349 { 351 350 enum … … 360 359 }; 361 360 362 struct KDEVPHPPARSER_EXPORTassignmentExpression_ast: public ast_node361 struct assignmentExpression_ast: public ast_node 363 362 { 364 363 enum … … 372 371 }; 373 372 374 struct KDEVPHPPARSER_EXPORTassignmentExpressionCheckIfVariable_ast: public ast_node373 struct assignmentExpressionCheckIfVariable_ast: public ast_node 375 374 { 376 375 enum … … 381 380 }; 382 381 383 struct KDEVPHPPARSER_EXPORTassignmentExpressionEqual_ast: public ast_node382 struct assignmentExpressionEqual_ast: public ast_node 384 383 { 385 384 enum … … 391 390 }; 392 391 393 struct KDEVPHPPARSER_EXPORTassignmentList_ast: public ast_node392 struct assignmentList_ast: public ast_node 394 393 { 395 394 enum … … 401 400 }; 402 401 403 struct KDEVPHPPARSER_EXPORTassignmentListElement_ast: public ast_node402 struct assignmentListElement_ast: public ast_node 404 403 { 405 404 enum … … 412 411 }; 413 412 414 struct KDEVPHPPARSER_EXPORTbaseVariable_ast: public ast_node413 struct baseVariable_ast: public ast_node 415 414 { 416 415 enum … … 424 423 }; 425 424 426 struct KDEVPHPPARSER_EXPORTbaseVariableWithFunctionCalls_ast: public ast_node425 struct baseVariableWithFunctionCalls_ast: public ast_node 427 426 { 428 427 enum … … 435 434 }; 436 435 437 struct KDEVPHPPARSER_EXPORTbitAndExpression_ast: public ast_node436 struct bitAndExpression_ast: public ast_node 438 437 { 439 438 enum … … 445 444 }; 446 445 447 struct KDEVPHPPARSER_EXPORTbitOrExpression_ast: public ast_node446 struct bitOrExpression_ast: public ast_node 448 447 { 449 448 enum … … 455 454 }; 456 455 457 struct KDEVPHPPARSER_EXPORTbitXorExpression_ast: public ast_node456 struct bitXorExpression_ast: public ast_node 458 457 { 459 458 enum … … 465 464 }; 466 465 467 struct KDEVPHPPARSER_EXPORTbooleanAndExpression_ast: public ast_node466 struct booleanAndExpression_ast: public ast_node 468 467 { 469 468 enum … … 475 474 }; 476 475 477 struct KDEVPHPPARSER_EXPORTbooleanOrExpression_ast: public ast_node476 struct booleanOrExpression_ast: public ast_node 478 477 { 479 478 enum … … 485 484 }; 486 485 487 struct KDEVPHPPARSER_EXPORTcaseList_ast: public ast_node486 struct caseList_ast: public ast_node 488 487 { 489 488 enum … … 495 494 }; 496 495 497 struct KDEVPHPPARSER_EXPORTcase_item_ast: public ast_node496 struct case_item_ast: public ast_node 498 497 { 499 498 enum … … 507 506 }; 508 507 509 struct KDEVPHPPARSER_EXPORTcatch_item_ast: public ast_node508 struct catch_item_ast: public ast_node 510 509 { 511 510 enum … … 518 517 }; 519 518 520 struct KDEVPHPPARSER_EXPORTclassConstantDeclaration_ast: public ast_node519 struct classConstantDeclaration_ast: public ast_node 521 520 { 522 521 enum … … 528 527 }; 529 528 530 struct KDEVPHPPARSER_EXPORTclassDeclarationStatement_ast: public ast_node529 struct classDeclarationStatement_ast: public ast_node 531 530 { 532 531 enum … … 542 541 }; 543 542 544 struct KDEVPHPPARSER_EXPORTclassNameReference_ast: public ast_node543 struct classNameReference_ast: public ast_node 545 544 { 546 545 enum … … 552 551 }; 553 552 554 struct KDEVPHPPARSER_EXPORTclassStatement_ast: public ast_node553 struct classStatement_ast: public ast_node 555 554 { 556 555 enum … … 565 564 }; 566 565 567 struct KDEVPHPPARSER_EXPORTclassVariable_ast: public ast_node566 struct classVariable_ast: public ast_node 568 567 { 569 568 enum … … 576 575 }; 577 576 578 struct KDEVPHPPARSER_EXPORTclassVariableDeclaration_ast: public ast_node577 struct classVariableDeclaration_ast: public ast_node 579 578 { 580 579 enum … … 586 585 }; 587 586 588 struct KDEVPHPPARSER_EXPORTcommonScalar_ast: public ast_node587 struct commonScalar_ast: public ast_node 589 588 { 590 589 enum … … 593 592 }; 594 593 595 Php::NumericType numType;596 }; 597 598 struct KDEVPHPPARSER_EXPORTcompoundVariable_ast: public ast_node594 rphp::NumericType numType; 595 }; 596 597 struct compoundVariable_ast: public ast_node 599 598 { 600 599 enum … … 607 606 }; 608 607 609 struct KDEVPHPPARSER_EXPORTcompoundVariableWithSimpleIndirectReference_ast: public ast_node608 struct compoundVariableWithSimpleIndirectReference_ast: public ast_node 610 609 { 611 610 enum … … 618 617 }; 619 618 620 struct KDEVPHPPARSER_EXPORTconditionalExpression_ast: public ast_node619 struct conditionalExpression_ast: public ast_node 621 620 { 622 621 enum … … 630 629 }; 631 630 632 struct KDEVPHPPARSER_EXPORTctorArguments_ast: public ast_node631 struct ctorArguments_ast: public ast_node 633 632 { 634 633 enum … … 640 639 }; 641 640 642 struct KDEVPHPPARSER_EXPORTdeclareItem_ast: public ast_node641 struct declareItem_ast: public ast_node 643 642 { 644 643 enum … … 650 649 }; 651 650 652 struct KDEVPHPPARSER_EXPORTdeclareStatement_ast: public ast_node651 struct declareStatement_ast: public ast_node 653 652 { 654 653 enum … … 661 660 }; 662 661 663 struct KDEVPHPPARSER_EXPORTdimListItem_ast: public ast_node662 struct dimListItem_ast: public ast_node 664 663 { 665 664 enum … … 672 671 }; 673 672 674 struct KDEVPHPPARSER_EXPORTdimOffset_ast: public ast_node673 struct dimOffset_ast: public ast_node 675 674 { 676 675 enum … … 682 681 }; 683 682 684 struct KDEVPHPPARSER_EXPORTdynamicClassNameReference_ast: public ast_node683 struct dynamicClassNameReference_ast: public ast_node 685 684 { 686 685 enum … … 694 693 }; 695 694 696 struct KDEVPHPPARSER_EXPORTdynamicClassNameVariableProperties_ast: public ast_node695 struct dynamicClassNameVariableProperties_ast: public ast_node 697 696 { 698 697 enum … … 704 703 }; 705 704 706 struct KDEVPHPPARSER_EXPORTdynamicClassNameVariableProperty_ast: public ast_node705 struct dynamicClassNameVariableProperty_ast: public ast_node 707 706 { 708 707 enum … … 714 713 }; 715 714 716 struct KDEVPHPPARSER_EXPORTelseSingle_ast: public ast_node715 struct elseSingle_ast: public ast_node 717 716 { 718 717 enum … … 724 723 }; 725 724 726 struct KDEVPHPPARSER_EXPORTelseifList_ast: public ast_node725 struct elseifList_ast: public ast_node 727 726 { 728 727 enum … … 734 733 }; 735 734 736 struct KDEVPHPPARSER_EXPORTelseifListItem_ast: public ast_node735 struct elseifListItem_ast: public ast_node 737 736 { 738 737 enum … … 745 744 }; 746 745 747 struct KDEVPHPPARSER_EXPORTencaps_ast: public ast_node746 struct encaps_ast: public ast_node 748 747 { 749 748 enum … … 756 755 }; 757 756 758 struct KDEVPHPPARSER_EXPORTencapsList_ast: public ast_node757 struct encapsList_ast: public ast_node 759 758 { 760 759 enum … … 766 765 }; 767 766 768 struct KDEVPHPPARSER_EXPORTencapsVar_ast: public ast_node767 struct encapsVar_ast: public ast_node 769 768 { 770 769 enum … … 777 776 }; 778 777 779 struct KDEVPHPPARSER_EXPORTencapsVarOffset_ast: public ast_node778 struct encapsVarOffset_ast: public ast_node 780 779 { 781 780 enum … … 786 785 }; 787 786 788 struct KDEVPHPPARSER_EXPORTequalityExpression_ast: public ast_node787 struct equalityExpression_ast: public ast_node 789 788 { 790 789 enum … … 797 796 }; 798 797 799 struct KDEVPHPPARSER_EXPORTequalityExpressionRest_ast: public ast_node798 struct equalityExpressionRest_ast: public ast_node 800 799 { 801 800 enum … … 807 806 }; 808 807 809 struct KDEVPHPPARSER_EXPORTexpr_ast: public ast_node808 struct expr_ast: public ast_node 810 809 { 811 810 enum … … 817 816 }; 818 817 819 struct KDEVPHPPARSER_EXPORTforExpr_ast: public ast_node818 struct forExpr_ast: public ast_node 820 819 { 821 820 enum … … 827 826 }; 828 827 829 struct KDEVPHPPARSER_EXPORTforStatement_ast: public ast_node828 struct forStatement_ast: public ast_node 830 829 { 831 830 enum … … 838 837 }; 839 838 840 struct KDEVPHPPARSER_EXPORTforeachOptionalArg_ast: public ast_node839 struct foreachOptionalArg_ast: public ast_node 841 840 { 842 841 enum … … 848 847 }; 849 848 850 struct KDEVPHPPARSER_EXPORTforeachStatement_ast: public ast_node849 struct foreachStatement_ast: public ast_node 851 850 { 852 851 enum … … 859 858 }; 860 859 861 struct KDEVPHPPARSER_EXPORTforeachVariable_ast: public ast_node860 struct foreachVariable_ast: public ast_node 862 861 { 863 862 enum … … 869 868 }; 870 869 871 struct KDEVPHPPARSER_EXPORTfunctionCall_ast: public ast_node870 struct functionCall_ast: public ast_node 872 871 { 873 872 enum … … 883 882 }; 884 883 885 struct KDEVPHPPARSER_EXPORTfunctionCallParameterList_ast: public ast_node884 struct functionCallParameterList_ast: public ast_node 886 885 { 887 886 enum … … 893 892 }; 894 893 895 struct KDEVPHPPARSER_EXPORTfunctionCallParameterListElement_ast: public ast_node894 struct functionCallParameterListElement_ast: public ast_node 896 895 { 897 896 enum … … 904 903 }; 905 904 906 struct KDEVPHPPARSER_EXPORTfunctionDeclarationStatement_ast: public ast_node905 struct functionDeclarationStatement_ast: public ast_node 907 906 { 908 907 enum … … 915 914 }; 916 915 917 struct KDEVPHPPARSER_EXPORTglobalVar_ast: public ast_node916 struct globalVar_ast: public ast_node 918 917 { 919 918 enum … … 927 926 }; 928 927 929 struct KDEVPHPPARSER_EXPORTinnerStatementList_ast: public ast_node928 struct innerStatementList_ast: public ast_node 930 929 { 931 930 enum … … 937 936 }; 938 937 939 struct KDEVPHPPARSER_EXPORTlogicalAndExpression_ast: public ast_node938 struct logicalAndExpression_ast: public ast_node 940 939 { 941 940 enum … … 947 946 }; 948 947 949 struct KDEVPHPPARSER_EXPORTlogicalOrExpression_ast: public ast_node948 struct logicalOrExpression_ast: public ast_node 950 949 { 951 950 enum … … 957 956 }; 958 957 959 struct KDEVPHPPARSER_EXPORTlogicalXorExpression_ast: public ast_node958 struct logicalXorExpression_ast: public ast_node 960 959 { 961 960 enum … … 967 966 }; 968 967 969 struct KDEVPHPPARSER_EXPORTmemberModifier_ast: public ast_node968 struct memberModifier_ast: public ast_node 970 969 { 971 970 enum … … 976 975 }; 977 976 978 struct KDEVPHPPARSER_EXPORTmethodBody_ast: public ast_node977 struct methodBody_ast: public ast_node 979 978 { 980 979 enum … … 986 985 }; 987 986 988 struct KDEVPHPPARSER_EXPORTmultiplicativeExpression_ast: public ast_node987 struct multiplicativeExpression_ast: public ast_node 989 988 { 990 989 enum … … 997 996 }; 998 997 999 struct KDEVPHPPARSER_EXPORTmultiplicativeExpression_rest_ast: public ast_node998 struct multiplicativeExpression_rest_ast: public ast_node 1000 999 { 1001 1000 enum … … 1007 1006 }; 1008 1007 1009 struct KDEVPHPPARSER_EXPORTnewElseSingle_ast: public ast_node1008 struct newElseSingle_ast: public ast_node 1010 1009 { 1011 1010 enum … … 1017 1016 }; 1018 1017 1019 struct KDEVPHPPARSER_EXPORTnewElseifList_ast: public ast_node1018 struct newElseifList_ast: public ast_node 1020 1019 { 1021 1020 enum … … 1027 1026 }; 1028 1027 1029 struct KDEVPHPPARSER_EXPORTnewelseifListItem_ast: public ast_node1028 struct newelseifListItem_ast: public ast_node 1030 1029 { 1031 1030 enum … … 1038 1037 }; 1039 1038 1040 struct KDEVPHPPARSER_EXPORTobjectDimList_ast: public ast_node1039 struct objectDimList_ast: public ast_node 1041 1040 { 1042 1041 enum … … 1049 1048 }; 1050 1049 1051 struct KDEVPHPPARSER_EXPORTobjectProperty_ast: public ast_node1050 struct objectProperty_ast: public ast_node 1052 1051 { 1053 1052 enum … … 1060 1059 }; 1061 1060 1062 struct KDEVPHPPARSER_EXPORTparameter_ast: public ast_node1061 struct parameter_ast: public ast_node 1063 1062 { 1064 1063 enum … … 1070 1069 }; 1071 1070 1072 struct KDEVPHPPARSER_EXPORTparameterList_ast: public ast_node1071 struct parameterList_ast: public ast_node 1073 1072 { 1074 1073 enum … … 1080 1079 }; 1081 1080 1082 struct KDEVPHPPARSER_EXPORTpostprefixOperator_ast: public ast_node1081 struct postprefixOperator_ast: public ast_node 1083 1082 { 1084 1083 enum … … 1090 1089 }; 1091 1090 1092 struct KDEVPHPPARSER_EXPORTprintExpression_ast: public ast_node1091 struct printExpression_ast: public ast_node 1093 1092 { 1094 1093 enum … … 1101 1100 }; 1102 1101 1103 struct KDEVPHPPARSER_EXPORTrelationalExpression_ast: public ast_node1102 struct relationalExpression_ast: public ast_node 1104 1103 { 1105 1104 enum … … 1113 1112 }; 1114 1113 1115 struct KDEVPHPPARSER_EXPORTrelationalExpressionRest_ast: public ast_node1114 struct relationalExpressionRest_ast: public ast_node 1116 1115 { 1117 1116 enum … … 1123 1122 }; 1124 1123 1125 struct KDEVPHPPARSER_EXPORTscalar_ast: public ast_node1124 struct scalar_ast: public ast_node 1126 1125 { 1127 1126 enum … … 1137 1136 }; 1138 1137 1139 struct KDEVPHPPARSER_EXPORTsemicolonOrCloseTag_ast: public ast_node1138 struct semicolonOrCloseTag_ast: public ast_node 1140 1139 { 1141 1140 enum … … 1146 1145 }; 1147 1146 1148 struct KDEVPHPPARSER_EXPORTshiftExpression_ast: public ast_node1147 struct shiftExpression_ast: public ast_node 1149 1148 { 1150 1149 enum … … 1157 1156 }; 1158 1157 1159 struct KDEVPHPPARSER_EXPORTshiftExpressionRest_ast: public ast_node1158 struct shiftExpressionRest_ast: public ast_node 1160 1159 { 1161 1160 enum … … 1167 1166 }; 1168 1167 1169 struct KDEVPHPPARSER_EXPORTstart_ast: public ast_node1168 struct start_ast: public ast_node 1170 1169 { 1171 1170 enum … … 1177 1176 }; 1178 1177 1179 struct KDEVPHPPARSER_EXPORTstatement_ast: public ast_node1178 struct statement_ast: public ast_node 1180 1179 { 1181 1180 enum … … 1218 1217 }; 1219 1218 1220 struct KDEVPHPPARSER_EXPORTstaticArrayPairValue_ast: public ast_node1219 struct staticArrayPairValue_ast: public ast_node 1221 1220 { 1222 1221 enum … … 1229 1228 }; 1230 1229 1231 struct KDEVPHPPARSER_EXPORTstaticMember_ast: public ast_node1230 struct staticMember_ast: public ast_node 1232 1231 { 1233 1232 enum … … 1240 1239 }; 1241 1240 1242 struct KDEVPHPPARSER_EXPORTstaticScalar_ast: public ast_node1241 struct staticScalar_ast: public ast_node 1243 1242 { 1244 1243 enum … … 1253 1252 }; 1254 1253 1255 struct KDEVPHPPARSER_EXPORTstaticVar_ast: public ast_node1254 struct staticVar_ast: public ast_node 1256 1255 { 1257 1256 enum … … 1263 1262 }; 1264 1263 1265 struct KDEVPHPPARSER_EXPORTswitchCaseList_ast: public ast_node1264 struct switchCaseList_ast: public ast_node 1266 1265 { 1267 1266 enum … … 1273 1272 }; 1274 1273 1275 struct KDEVPHPPARSER_EXPORTtopStatement_ast: public ast_node1274 struct topStatement_ast: public ast_node 1276 1275 { 1277 1276 enum … … 1285 1284 }; 1286 1285 1287 struct KDEVPHPPARSER_EXPORTunaryExpression_ast: public ast_node1286 struct unaryExpression_ast: public ast_node 1288 1287 { 1289 1288 enum … … 1298 1297 }; 1299 1298 1300 struct KDEVPHPPARSER_EXPORTunaryExpression_not_plusminus_ast: public ast_node1299 struct unaryExpression_not_plusminus_ast: public ast_node 1301 1300 { 1302 1301 enum … … 1310 1309 }; 1311 1310 1312 struct KDEVPHPPARSER_EXPORTvarExpression_ast: public ast_node1311 struct varExpression_ast: public ast_node 1313 1312 { 1314 1313 enum … … 1322 1321 }; 1323 1322 1324 struct KDEVPHPPARSER_EXPORTvarExpressionNewObject_ast: public ast_node1323 struct varExpressionNewObject_ast: public ast_node 1325 1324 { 1326 1325 enum … … 1333 1332 }; 1334 1333 1335 struct KDEVPHPPARSER_EXPORTvarExpressionNormal_ast: public ast_node1334 struct varExpressionNormal_ast: public ast_node 1336 1335 { 1337 1336 enum … … 1351 1350 }; 1352 1351 1353 struct KDEVPHPPARSER_EXPORTvariable_ast: public ast_node1352 struct variable_ast: public ast_node 1354 1353 { 1355 1354 enum … … 1362 1361 }; 1363 1362 1364 struct KDEVPHPPARSER_EXPORTvariableName_ast: public ast_node1363 struct variableName_ast: public ast_node 1365 1364 { 1366 1365 enum … … 1373 1372 }; 1374 1373 1375 struct KDEVPHPPARSER_EXPORTvariableProperty_ast: public ast_node1374 struct variableProperty_ast: public ast_node 1376 1375 { 1377 1376 enum … … 1384 1383 }; 1385 1384 1386 struct KDEVPHPPARSER_EXPORTvariableWithoutObjects_ast: public ast_node1385 struct variableWithoutObjects_ast: public ast_node 1387 1386 { 1388 1387 enum … … 1395 1394 }; 1396 1395 1397 struct KDEVPHPPARSER_EXPORTwhileStatement_ast: public ast_node1396 struct whileStatement_ast: public ast_node 1398 1397 { 1399 1398 enum trunk/rphp/compiler/parser/rphp_default_visitor.h
r555 r559 7 7 #include "rphp_visitor.h" 8 8 9 #include <parserexport.h>10 11 9 namespace rphp 12 10 { 13 11 14 class KDEVPHPPARSER_EXPORTdefault_visitor: public visitor12 class default_visitor: public visitor 15 13 { 16 14 trunk/rphp/compiler/parser/rphp_parser.cpp
r557 r559 6 6 7 7 #include "phplexer.h" 8 #include <QtCore/QDebug> 9 10 namespace Php 8 9 namespace rphp 11 10 { 12 11 … … 52 51 { 53 52 if (type == Error) 54 qDebug()<< "** ERROR:" << message;53 cout << "** ERROR:" << message; 55 54 else if (type == Warning) 56 qDebug()<< "** WARNING:" << message;55 cout << "** WARNING:" << message; 57 56 else if (type == Info) 58 qDebug()<< "** Info:" << message;57 cout << "** Info:" << message; 59 58 } 60 59 … … 107 106 } 108 107 109 } // end of namespace Php108 } // end of namespace rphp 110 109 111 110 … … 3216 3215 yylex(); 3217 3216 3218 (*yynode)->numType = Php::LongNumber;3217 (*yynode)->numType = rphp::LongNumber; 3219 3218 } 3220 3219 … … 3233 3232 yylex(); 3234 3233 3235 (*yynode)->numType = Php::DoubleNumber;3234 (*yynode)->numType = rphp::DoubleNumber; 3236 3235 } 3237 3236 trunk/rphp/compiler/parser/rphp_parser.h
r557 r559 10 10 #include <kdev-pg-token-stream.h> 11 11 12 #include <parserexport.h>13 14 12 namespace rphp 15 13 { 16 14 17 class KDEVPHPPARSER_EXPORTparser15 class parser 18 16 { 19 17 trunk/rphp/compiler/parser/rphp_visitor.h
r555 r559 7 7 #include "rphp_ast.h" 8 8 9 #include <parserexport.h>10 11 9 namespace rphp 12 10 { 13 11 14 class KDEVPHPPARSER_EXPORTvisitor12 class visitor 15 13 { 16 14 typedef void (visitor::*parser_fun_t)(ast_node *);
