Changeset 1425


Ignore:
Timestamp:
May 30, 2012, 7:59:08 PM (8 years ago)
Author:
sam
Message:

orbital: make sure to include "config.h" in all compiled files.

Location:
trunk/orbital
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/generated/gun-parser.cpp

    r1424 r1425  
    5858#include "../gun.h"
    5959
    60 #include <stdio.h>
    6160#include <string>
    62 #include <vector>
    6361
    6462
    6563/* Line 293 of lalr1.cc  */
    66 #line 67 "generated/gun-parser.cpp"
     64#line 65 "generated/gun-parser.cpp"
    6765
    6866
     
    7270
    7371/* Line 299 of lalr1.cc  */
    74 #line 68 "gun-parser.y"
     72#line 66 "gun-parser.y"
    7573
    7674#include "../gun-compiler.h"
     
    8179
    8280/* Line 299 of lalr1.cc  */
    83 #line 84 "generated/gun-parser.cpp"
     81#line 82 "generated/gun-parser.cpp"
    8482
    8583#ifndef YY_
     
    167165
    168166/* Line 382 of lalr1.cc  */
    169 #line 170 "generated/gun-parser.cpp"
     167#line 168 "generated/gun-parser.cpp"
    170168
    171169  /* Return YYSTR after stripping away unnecessary quotes and
     
    468466
    469467/* Line 690 of lalr1.cc  */
     468#line 85 "gun-parser.y"
     469    { gc.m_gun.m_angle = gc.m_gun.AimActor(); }
     470    break;
     471
     472  case 6:
     473
     474/* Line 690 of lalr1.cc  */
     475#line 86 "gun-parser.y"
     476    { gc.m_gun.PreAimActor((yysemantic_stack_[(2) - (2)].args).f0); }
     477    break;
     478
     479  case 7:
     480
     481/* Line 690 of lalr1.cc  */
    470482#line 87 "gun-parser.y"
    471     { gc.m_gun.m_angle = gc.m_gun.AimActor(); }
    472     break;
    473 
    474   case 6:
     483    { gc.m_gun.m_pre_aim = (yysemantic_stack_[(2) - (2)].args).f0; }
     484    break;
     485
     486  case 8:
    475487
    476488/* Line 690 of lalr1.cc  */
    477489#line 88 "gun-parser.y"
    478     { gc.m_gun.PreAimActor((yysemantic_stack_[(2) - (2)].args).f0); }
    479     break;
    480 
    481   case 7:
     490    { gc.m_gun.m_angle = (yysemantic_stack_[(2) - (2)].args).f0; }
     491    break;
     492
     493  case 9:
    482494
    483495/* Line 690 of lalr1.cc  */
    484496#line 89 "gun-parser.y"
    485     { gc.m_gun.m_pre_aim = (yysemantic_stack_[(2) - (2)].args).f0; }
    486     break;
    487 
    488   case 8:
     497    { gc.m_gun.m_round_duration = (yysemantic_stack_[(2) - (2)].args).f0; }
     498    break;
     499
     500  case 10:
    489501
    490502/* Line 690 of lalr1.cc  */
    491503#line 90 "gun-parser.y"
    492     { gc.m_gun.m_angle = (yysemantic_stack_[(2) - (2)].args).f0; }
    493     break;
    494 
    495   case 9:
     504    { gc.m_gun.m_angle_offset = (yysemantic_stack_[(2) - (2)].args).f0; }
     505    break;
     506
     507  case 11:
    496508
    497509/* Line 690 of lalr1.cc  */
    498510#line 91 "gun-parser.y"
    499     { gc.m_gun.m_round_duration = (yysemantic_stack_[(2) - (2)].args).f0; }
    500     break;
    501 
    502   case 10:
     511    { gc.m_gun.m_radius = (yysemantic_stack_[(2) - (2)].args).f0; }
     512    break;
     513
     514  case 12:
    503515
    504516/* Line 690 of lalr1.cc  */
    505517#line 92 "gun-parser.y"
    506     { gc.m_gun.m_angle_offset = (yysemantic_stack_[(2) - (2)].args).f0; }
    507     break;
    508 
    509   case 11:
     518    { gc.m_gun.m_shoot_speed = (yysemantic_stack_[(2) - (2)].args).f0; }
     519    break;
     520
     521  case 13:
    510522
    511523/* Line 690 of lalr1.cc  */
    512524#line 93 "gun-parser.y"
    513     { gc.m_gun.m_radius = (yysemantic_stack_[(2) - (2)].args).f0; }
    514     break;
    515 
    516   case 12:
     525    { /* FIXME: 1st modifier */ }
     526    break;
     527
     528  case 14:
    517529
    518530/* Line 690 of lalr1.cc  */
    519531#line 94 "gun-parser.y"
    520     { gc.m_gun.m_shoot_speed = (yysemantic_stack_[(2) - (2)].args).f0; }
    521     break;
    522 
    523   case 13:
     532    { /* FIXME: 2nd modifier */ }
     533    break;
     534
     535  case 15:
    524536
    525537/* Line 690 of lalr1.cc  */
    526538#line 95 "gun-parser.y"
    527     { /* FIXME: 1st modifier */ }
    528     break;
    529 
    530   case 14:
    531 
    532 /* Line 690 of lalr1.cc  */
    533 #line 96 "gun-parser.y"
    534     { /* FIXME: 2nd modifier */ }
    535     break;
    536 
    537   case 15:
    538 
    539 /* Line 690 of lalr1.cc  */
    540 #line 97 "gun-parser.y"
    541539    { for (int i = 0; i < (int)(yysemantic_stack_[(2) - (2)].args).f0; i++) gc.m_gun.Shoot(1);
    542540                      gc.m_gun.m_shoot_type = 1;
     
    547545
    548546/* Line 690 of lalr1.cc  */
    549 #line 100 "gun-parser.y"
     547#line 98 "gun-parser.y"
    550548    { for (int i = 0; i < (int)(yysemantic_stack_[(2) - (2)].args).f0; i++) gc.m_gun.Shoot(0);
    551549                      gc.m_gun.m_shoot_type = 0;
     
    556554
    557555/* Line 690 of lalr1.cc  */
    558 #line 103 "gun-parser.y"
     556#line 101 "gun-parser.y"
    559557    { gc.m_gun.Shoot(1); gc.m_gun.m_nbshoots = (int)(yysemantic_stack_[(2) - (2)].args).f0 - 1;
    560558                      gc.m_gun.m_shoot_type = 1;
     
    565563
    566564/* Line 690 of lalr1.cc  */
    567 #line 106 "gun-parser.y"
     565#line 104 "gun-parser.y"
    568566    { gc.m_gun.Shoot(0); gc.m_gun.m_nbshoots = (int)(yysemantic_stack_[(2) - (2)].args).f0 - 1;
    569567                      gc.m_gun.m_shoot_type = 0;
     
    574572
    575573/* Line 690 of lalr1.cc  */
    576 #line 109 "gun-parser.y"
     574#line 107 "gun-parser.y"
    577575    { gc.m_gun.m_round_timer = gc.m_gun.m_round_duration * (yysemantic_stack_[(2) - (2)].args).f0;
    578576                      /* FIXME: modifiers */ }
     
    582580
    583581/* Line 690 of lalr1.cc  */
    584 #line 111 "gun-parser.y"
     582#line 109 "gun-parser.y"
    585583    { /* FIXME: loops */ }
    586584    break;
     
    589587
    590588/* Line 690 of lalr1.cc  */
     589#line 112 "gun-parser.y"
     590    { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
     591    break;
     592
     593  case 22:
     594
     595/* Line 690 of lalr1.cc  */
     596#line 113 "gun-parser.y"
     597    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(3) - (3)].fval); }
     598    break;
     599
     600  case 23:
     601
     602/* Line 690 of lalr1.cc  */
    591603#line 114 "gun-parser.y"
    592     { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
    593     break;
    594 
    595   case 22:
    596 
    597 /* Line 690 of lalr1.cc  */
    598 #line 115 "gun-parser.y"
    599     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(3) - (3)].fval); }
    600     break;
    601 
    602   case 23:
    603 
    604 /* Line 690 of lalr1.cc  */
    605 #line 116 "gun-parser.y"
    606604    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f2 = (yysemantic_stack_[(3) - (3)].fval); }
    607605    break;
     
    610608
    611609/* Line 690 of lalr1.cc  */
    612 #line 119 "gun-parser.y"
     610#line 117 "gun-parser.y"
    613611    { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); }
    614612    break;
     
    617615
    618616/* Line 690 of lalr1.cc  */
    619 #line 120 "gun-parser.y"
     617#line 118 "gun-parser.y"
    620618    { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); }
    621619    break;
     
    624622
    625623/* Line 690 of lalr1.cc  */
    626 #line 627 "generated/gun-parser.cpp"
     624#line 625 "generated/gun-parser.cpp"
    627625        default:
    628626          break;
     
    10461044  GunParser::yyrline_[] =
    10471045  {
    1048          0,    78,    78,    82,    83,    87,    88,    89,    90,    91,
    1049       92,    93,    94,    95,    96,    97,   100,   103,   106,   109,
    1050      111,   114,   115,   116,   119,   120
     1046         0,    76,    76,    80,    81,    85,    86,    87,    88,    89,
     1047      90,    91,    92,    93,    94,    95,    98,   101,   104,   107,
     1048     109,   112,   113,   114,   117,   118
    10511049  };
    10521050
     
    11391137
    11401138/* Line 1136 of lalr1.cc  */
    1141 #line 1142 "generated/gun-parser.cpp"
     1139#line 1140 "generated/gun-parser.cpp"
    11421140
    11431141
    11441142/* Line 1138 of lalr1.cc  */
    1145 #line 123 "gun-parser.y"
     1143#line 121 "gun-parser.y"
    11461144
    11471145
  • trunk/orbital/generated/gun-parser.h

    r1424 r1425  
    7777
    7878/* Line 35 of lalr1.cc  */
    79 #line 37 "gun-parser.y"
     79#line 35 "gun-parser.y"
    8080
    8181    float fval;
  • trunk/orbital/generated/gun-scanner.cpp

    r1424 r1425  
    449449//
    450450
     451#if defined HAVE_CONFIG_H
     452#   include "config.h"
     453#endif
     454
     455#include "core.h"
     456#include "loldebug.h"
     457
     458using namespace lol;
     459
    451460#include "../gun-compiler.h"
    452461
     
    463472#define YY_NO_UNISTD_H
    464473#define YY_USER_ACTION yylloc->columns(yyleng);
    465 #line 466 "generated/gun-scanner.cpp"
     474#line 475 "generated/gun-scanner.cpp"
    466475
    467476#define INITIAL 0
     
    568577        register int yy_act;
    569578   
    570 #line 29 "gun-scanner.l"
     579#line 38 "gun-scanner.l"
    571580
    572581
     
    576585
    577586
    578 #line 579 "generated/gun-scanner.cpp"
     587#line 588 "generated/gun-scanner.cpp"
    579588
    580589        if ( !(yy_init) )
     
    657666case 1:
    658667YY_RULE_SETUP
    659 #line 36 "gun-scanner.l"
     668#line 45 "gun-scanner.l"
    660669{ return token::T_AI; }
    661670        YY_BREAK
    662671case 2:
    663672YY_RULE_SETUP
    664 #line 37 "gun-scanner.l"
     673#line 46 "gun-scanner.l"
    665674{ return token::T_PAI; }
    666675        YY_BREAK
    667676case 3:
    668677YY_RULE_SETUP
    669 #line 38 "gun-scanner.l"
     678#line 47 "gun-scanner.l"
    670679{ return token::T_CA; }
    671680        YY_BREAK
    672681case 4:
    673682YY_RULE_SETUP
    674 #line 39 "gun-scanner.l"
     683#line 48 "gun-scanner.l"
    675684{ return token::T_SA; }
    676685        YY_BREAK
    677686case 5:
    678687YY_RULE_SETUP
    679 #line 40 "gun-scanner.l"
     688#line 49 "gun-scanner.l"
    680689{ return token::T_TIM; }
    681690        YY_BREAK
    682691case 6:
    683692YY_RULE_SETUP
    684 #line 41 "gun-scanner.l"
     693#line 50 "gun-scanner.l"
    685694{ return token::T_SO; }
    686695        YY_BREAK
    687696case 7:
    688697YY_RULE_SETUP
    689 #line 42 "gun-scanner.l"
     698#line 51 "gun-scanner.l"
    690699{ return token::T_RD; }
    691700        YY_BREAK
    692701case 8:
    693702YY_RULE_SETUP
    694 #line 43 "gun-scanner.l"
     703#line 52 "gun-scanner.l"
    695704{ return token::T_SPD; }
    696705        YY_BREAK
    697706case 9:
    698707YY_RULE_SETUP
    699 #line 44 "gun-scanner.l"
     708#line 53 "gun-scanner.l"
    700709{ return token::T_MODA; }
    701710        YY_BREAK
    702711case 10:
    703712YY_RULE_SETUP
    704 #line 45 "gun-scanner.l"
     713#line 54 "gun-scanner.l"
    705714{ return token::T_MODB; }
    706715        YY_BREAK
    707716case 11:
    708717YY_RULE_SETUP
    709 #line 46 "gun-scanner.l"
     718#line 55 "gun-scanner.l"
    710719{ return token::T_FFB; }
    711720        YY_BREAK
    712721case 12:
    713722YY_RULE_SETUP
    714 #line 47 "gun-scanner.l"
     723#line 56 "gun-scanner.l"
    715724{ return token::T_FFP; }
    716725        YY_BREAK
    717726case 13:
    718727YY_RULE_SETUP
    719 #line 48 "gun-scanner.l"
     728#line 57 "gun-scanner.l"
    720729{ return token::T_FB; }
    721730        YY_BREAK
    722731case 14:
    723732YY_RULE_SETUP
    724 #line 49 "gun-scanner.l"
     733#line 58 "gun-scanner.l"
    725734{ return token::T_FP; }
    726735        YY_BREAK
    727736case 15:
    728737YY_RULE_SETUP
    729 #line 50 "gun-scanner.l"
     738#line 59 "gun-scanner.l"
    730739{ return token::T_SK; }
    731740        YY_BREAK
    732741case 16:
    733742YY_RULE_SETUP
    734 #line 51 "gun-scanner.l"
     743#line 60 "gun-scanner.l"
    735744{ return token::T_LOOP; }
    736745        YY_BREAK
    737746case 17:
    738747YY_RULE_SETUP
    739 #line 53 "gun-scanner.l"
     748#line 62 "gun-scanner.l"
    740749{
    741750        yylval->fval = atof(yytext); return token::NUMBER; }
     
    743752case 18:
    744753YY_RULE_SETUP
    745 #line 55 "gun-scanner.l"
     754#line 64 "gun-scanner.l"
    746755{ return token_type('-'); }
    747756        YY_BREAK
    748757case 19:
    749758YY_RULE_SETUP
    750 #line 56 "gun-scanner.l"
     759#line 65 "gun-scanner.l"
    751760{ return token_type(','); }
    752761        YY_BREAK
     
    754763/* rule 20 can match eol */
    755764YY_RULE_SETUP
    756 #line 57 "gun-scanner.l"
     765#line 66 "gun-scanner.l"
    757766{ /* ignore everything else */ }
    758767        YY_BREAK
    759768case 21:
    760769YY_RULE_SETUP
    761 #line 59 "gun-scanner.l"
     770#line 68 "gun-scanner.l"
    762771ECHO;
    763772        YY_BREAK
    764 #line 765 "generated/gun-scanner.cpp"
     773#line 774 "generated/gun-scanner.cpp"
    765774case YY_STATE_EOF(INITIAL):
    766775        yyterminate();
     
    16631672#define YYTABLES_NAME "yytables"
    16641673
    1665 #line 59 "gun-scanner.l"
     1674#line 68 "gun-scanner.l"
    16661675
    16671676
  • trunk/orbital/generated/mesh-parser.cpp

    r1424 r1425  
    5858#include "../mesh.h"
    5959
    60 #include <stdio.h>
    6160#include <string>
    62 #include <vector>
    6361
    6462
    6563/* Line 293 of lalr1.cc  */
    66 #line 67 "generated/mesh-parser.cpp"
     64#line 65 "generated/mesh-parser.cpp"
    6765
    6866
     
    7270
    7371/* Line 299 of lalr1.cc  */
    74 #line 63 "mesh-parser.y"
     72#line 61 "mesh-parser.y"
    7573
    7674#include "../mesh-compiler.h"
     
    8179
    8280/* Line 299 of lalr1.cc  */
    83 #line 84 "generated/mesh-parser.cpp"
     81#line 82 "generated/mesh-parser.cpp"
    8482
    8583#ifndef YY_
     
    167165
    168166/* Line 382 of lalr1.cc  */
    169 #line 170 "generated/mesh-parser.cpp"
     167#line 168 "generated/mesh-parser.cpp"
    170168
    171169  /* Return YYSTR after stripping away unnecessary quotes and
     
    468466
    469467/* Line 690 of lalr1.cc  */
     468#line 87 "mesh-parser.y"
     469    { mc.m_mesh.Flush(); }
     470    break;
     471
     472  case 10:
     473
     474/* Line 690 of lalr1.cc  */
     475#line 88 "mesh-parser.y"
     476    { mc.m_mesh.MeshConvert(); }
     477    break;
     478
     479  case 11:
     480
     481/* Line 690 of lalr1.cc  */
    470482#line 89 "mesh-parser.y"
    471     { mc.m_mesh.Flush(); }
    472     break;
    473 
    474   case 10:
    475 
    476 /* Line 690 of lalr1.cc  */
    477 #line 90 "mesh-parser.y"
    478     { mc.m_mesh.MeshConvert(); }
    479     break;
    480 
    481   case 11:
    482 
    483 /* Line 690 of lalr1.cc  */
    484 #line 91 "mesh-parser.y"
    485483    { /* TODO */ }
    486484    break;
     
    489487
    490488/* Line 690 of lalr1.cc  */
    491 #line 95 "mesh-parser.y"
     489#line 93 "mesh-parser.y"
    492490    { mc.m_mesh.SetCurColor(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
    493491    break;
     
    496494
    497495/* Line 690 of lalr1.cc  */
    498 #line 96 "mesh-parser.y"
     496#line 94 "mesh-parser.y"
    499497    { mc.m_mesh.SetCurColor2(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
    500498    break;
     
    503501
    504502/* Line 690 of lalr1.cc  */
     503#line 98 "mesh-parser.y"
     504    { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
     505    break;
     506
     507  case 15:
     508
     509/* Line 690 of lalr1.cc  */
     510#line 99 "mesh-parser.y"
     511    { mc.m_mesh.Translate(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
     512    break;
     513
     514  case 16:
     515
     516/* Line 690 of lalr1.cc  */
    505517#line 100 "mesh-parser.y"
    506     { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
    507     break;
    508 
    509   case 15:
     518    { mc.m_mesh.Translate(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
     519    break;
     520
     521  case 17:
    510522
    511523/* Line 690 of lalr1.cc  */
    512524#line 101 "mesh-parser.y"
    513     { mc.m_mesh.Translate(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
    514     break;
    515 
    516   case 16:
     525    { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
     526    break;
     527
     528  case 18:
    517529
    518530/* Line 690 of lalr1.cc  */
    519531#line 102 "mesh-parser.y"
    520     { mc.m_mesh.Translate(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
    521     break;
    522 
    523   case 17:
     532    { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].args).f0); }
     533    break;
     534
     535  case 19:
    524536
    525537/* Line 690 of lalr1.cc  */
    526538#line 103 "mesh-parser.y"
    527     { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    528     break;
    529 
    530   case 18:
     539    { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].args).f0); }
     540    break;
     541
     542  case 20:
    531543
    532544/* Line 690 of lalr1.cc  */
    533545#line 104 "mesh-parser.y"
    534     { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].args).f0); }
    535     break;
    536 
    537   case 19:
     546    { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].args).f0); }
     547    break;
     548
     549  case 21:
    538550
    539551/* Line 690 of lalr1.cc  */
    540552#line 105 "mesh-parser.y"
    541     { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].args).f0); }
    542     break;
    543 
    544   case 20:
     553    { mc.m_mesh.TaperX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     554    break;
     555
     556  case 22:
    545557
    546558/* Line 690 of lalr1.cc  */
    547559#line 106 "mesh-parser.y"
    548     { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].args).f0); }
    549     break;
    550 
    551   case 21:
     560    { mc.m_mesh.TaperY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     561    break;
     562
     563  case 23:
    552564
    553565/* Line 690 of lalr1.cc  */
    554566#line 107 "mesh-parser.y"
    555     { mc.m_mesh.TaperX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    556     break;
    557 
    558   case 22:
     567    { mc.m_mesh.TaperZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     568    break;
     569
     570  case 24:
    559571
    560572/* Line 690 of lalr1.cc  */
    561573#line 108 "mesh-parser.y"
    562     { mc.m_mesh.TaperY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    563     break;
    564 
    565   case 23:
     574    { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
     575    break;
     576
     577  case 25:
    566578
    567579/* Line 690 of lalr1.cc  */
    568580#line 109 "mesh-parser.y"
    569     { mc.m_mesh.TaperZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
    570     break;
    571 
    572   case 24:
     581    { mc.m_mesh.Scale(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
     582    break;
     583
     584  case 26:
    573585
    574586/* Line 690 of lalr1.cc  */
    575587#line 110 "mesh-parser.y"
    576     { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
    577     break;
    578 
    579   case 25:
     588    { mc.m_mesh.Scale(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
     589    break;
     590
     591  case 27:
    580592
    581593/* Line 690 of lalr1.cc  */
    582594#line 111 "mesh-parser.y"
    583     { mc.m_mesh.Scale(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
    584     break;
    585 
    586   case 26:
     595    { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
     596    break;
     597
     598  case 28:
    587599
    588600/* Line 690 of lalr1.cc  */
    589601#line 112 "mesh-parser.y"
    590     { mc.m_mesh.Scale(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
    591     break;
    592 
    593   case 27:
     602    { mc.m_mesh.MirrorX(); }
     603    break;
     604
     605  case 29:
    594606
    595607/* Line 690 of lalr1.cc  */
    596608#line 113 "mesh-parser.y"
    597     { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    598     break;
    599 
    600   case 28:
     609    { mc.m_mesh.MirrorY(); }
     610    break;
     611
     612  case 30:
    601613
    602614/* Line 690 of lalr1.cc  */
    603615#line 114 "mesh-parser.y"
    604     { mc.m_mesh.MirrorX(); }
    605     break;
    606 
    607   case 29:
    608 
    609 /* Line 690 of lalr1.cc  */
    610 #line 115 "mesh-parser.y"
    611     { mc.m_mesh.MirrorY(); }
    612     break;
    613 
    614   case 30:
    615 
    616 /* Line 690 of lalr1.cc  */
    617 #line 116 "mesh-parser.y"
    618616    { mc.m_mesh.MirrorZ(); }
    619617    break;
     
    622620
    623621/* Line 690 of lalr1.cc  */
    624 #line 120 "mesh-parser.y"
     622#line 118 "mesh-parser.y"
    625623    { mc.m_mesh.AppendCylinder((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    626624                                                 (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
     
    631629
    632630/* Line 690 of lalr1.cc  */
    633 #line 123 "mesh-parser.y"
     631#line 121 "mesh-parser.y"
    634632    { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
    635633    break;
     
    638636
    639637/* Line 690 of lalr1.cc  */
    640 #line 124 "mesh-parser.y"
     638#line 122 "mesh-parser.y"
    641639    { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    642640                                                            (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
     
    646644
    647645/* Line 690 of lalr1.cc  */
    648 #line 126 "mesh-parser.y"
     646#line 124 "mesh-parser.y"
    649647    { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    650648                                                          (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
     
    654652
    655653/* Line 690 of lalr1.cc  */
    656 #line 128 "mesh-parser.y"
     654#line 126 "mesh-parser.y"
    657655    { mc.m_mesh.AppendSphere((yysemantic_stack_[(2) - (2)].args).f0,
    658656                                               vec3((yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
     
    662660
    663661/* Line 690 of lalr1.cc  */
    664 #line 130 "mesh-parser.y"
     662#line 128 "mesh-parser.y"
    665663    { mc.m_mesh.AppendStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2,
    666664                                             (int)(yysemantic_stack_[(2) - (2)].args).f3, (int)(yysemantic_stack_[(2) - (2)].args).f4); }
     
    670668
    671669/* Line 690 of lalr1.cc  */
    672 #line 132 "mesh-parser.y"
     670#line 130 "mesh-parser.y"
    673671    { mc.m_mesh.AppendExpandedStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
    674672                                                     (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     
    678676
    679677/* Line 690 of lalr1.cc  */
     678#line 132 "mesh-parser.y"
     679    { mc.m_mesh.AppendDisc((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (int)(yysemantic_stack_[(2) - (2)].args).f2); }
     680    break;
     681
     682  case 39:
     683
     684/* Line 690 of lalr1.cc  */
     685#line 133 "mesh-parser.y"
     686    { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
     687    break;
     688
     689  case 40:
     690
     691/* Line 690 of lalr1.cc  */
    680692#line 134 "mesh-parser.y"
    681     { mc.m_mesh.AppendDisc((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (int)(yysemantic_stack_[(2) - (2)].args).f2); }
    682     break;
    683 
    684   case 39:
     693    { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
     694    break;
     695
     696  case 41:
    685697
    686698/* Line 690 of lalr1.cc  */
    687699#line 135 "mesh-parser.y"
    688     { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
    689     break;
    690 
    691   case 40:
    692 
    693 /* Line 690 of lalr1.cc  */
    694 #line 136 "mesh-parser.y"
    695     { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
    696     break;
    697 
    698   case 41:
    699 
    700 /* Line 690 of lalr1.cc  */
    701 #line 137 "mesh-parser.y"
    702700    { mc.m_mesh.AppendCog((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
    703701                                            (yysemantic_stack_[(2) - (2)].args).f4, (yysemantic_stack_[(2) - (2)].args).f5, (yysemantic_stack_[(2) - (2)].args).f6, (int)(yysemantic_stack_[(2) - (2)].args).f7); }
     
    707705
    708706/* Line 690 of lalr1.cc  */
     707#line 139 "mesh-parser.y"
     708    { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
     709    break;
     710
     711  case 43:
     712
     713/* Line 690 of lalr1.cc  */
     714#line 140 "mesh-parser.y"
     715    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(3) - (3)].fval); }
     716    break;
     717
     718  case 44:
     719
     720/* Line 690 of lalr1.cc  */
    709721#line 141 "mesh-parser.y"
    710     { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
    711     break;
    712 
    713   case 43:
     722    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f2 = (yysemantic_stack_[(3) - (3)].fval); }
     723    break;
     724
     725  case 45:
    714726
    715727/* Line 690 of lalr1.cc  */
    716728#line 142 "mesh-parser.y"
    717     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(3) - (3)].fval); }
    718     break;
    719 
    720   case 44:
     729    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f3 = (yysemantic_stack_[(3) - (3)].fval); }
     730    break;
     731
     732  case 46:
    721733
    722734/* Line 690 of lalr1.cc  */
    723735#line 143 "mesh-parser.y"
    724     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f2 = (yysemantic_stack_[(3) - (3)].fval); }
    725     break;
    726 
    727   case 45:
     736    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f4 = (yysemantic_stack_[(3) - (3)].fval); }
     737    break;
     738
     739  case 47:
    728740
    729741/* Line 690 of lalr1.cc  */
    730742#line 144 "mesh-parser.y"
    731     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f3 = (yysemantic_stack_[(3) - (3)].fval); }
    732     break;
    733 
    734   case 46:
     743    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f5 = (yysemantic_stack_[(3) - (3)].fval); }
     744    break;
     745
     746  case 48:
    735747
    736748/* Line 690 of lalr1.cc  */
    737749#line 145 "mesh-parser.y"
    738     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f4 = (yysemantic_stack_[(3) - (3)].fval); }
    739     break;
    740 
    741   case 47:
     750    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f6 = (yysemantic_stack_[(3) - (3)].fval); }
     751    break;
     752
     753  case 49:
    742754
    743755/* Line 690 of lalr1.cc  */
    744756#line 146 "mesh-parser.y"
    745     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f5 = (yysemantic_stack_[(3) - (3)].fval); }
    746     break;
    747 
    748   case 48:
    749 
    750 /* Line 690 of lalr1.cc  */
    751 #line 147 "mesh-parser.y"
    752     { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f6 = (yysemantic_stack_[(3) - (3)].fval); }
    753     break;
    754 
    755   case 49:
    756 
    757 /* Line 690 of lalr1.cc  */
    758 #line 148 "mesh-parser.y"
    759757    { (yyval.args) = (yysemantic_stack_[(3) - (1)].args); (yyval.args).f7 = (yysemantic_stack_[(3) - (3)].fval); }
    760758    break;
     
    763761
    764762/* Line 690 of lalr1.cc  */
    765 #line 151 "mesh-parser.y"
     763#line 149 "mesh-parser.y"
    766764    { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); }
    767765    break;
     
    770768
    771769/* Line 690 of lalr1.cc  */
    772 #line 152 "mesh-parser.y"
     770#line 150 "mesh-parser.y"
    773771    { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); }
    774772    break;
     
    777775
    778776/* Line 690 of lalr1.cc  */
    779 #line 780 "generated/mesh-parser.cpp"
     777#line 778 "generated/mesh-parser.cpp"
    780778        default:
    781779          break;
     
    12471245  MeshParser::yyrline_[] =
    12481246  {
    1249          0,    73,    73,    77,    78,    82,    83,    84,    85,    89,
    1250       90,    91,    95,    96,   100,   101,   102,   103,   104,   105,
    1251      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
    1252      116,   120,   123,   124,   126,   128,   130,   132,   134,   135,
    1253      136,   137,   141,   142,   143,   144,   145,   146,   147,   148,
    1254      151,   152
     1247         0,    71,    71,    75,    76,    80,    81,    82,    83,    87,
     1248      88,    89,    93,    94,    98,    99,   100,   101,   102,   103,
     1249     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
     1250     114,   118,   121,   122,   124,   126,   128,   130,   132,   133,
     1251     134,   135,   139,   140,   141,   142,   143,   144,   145,   146,
     1252     149,   150
    12551253  };
    12561254
     
    13451343
    13461344/* Line 1136 of lalr1.cc  */
    1347 #line 1348 "generated/mesh-parser.cpp"
     1345#line 1346 "generated/mesh-parser.cpp"
    13481346
    13491347
    13501348/* Line 1138 of lalr1.cc  */
    1351 #line 155 "mesh-parser.y"
     1349#line 153 "mesh-parser.y"
    13521350
    13531351
  • trunk/orbital/generated/mesh-parser.h

    r1424 r1425  
    7777
    7878/* Line 35 of lalr1.cc  */
    79 #line 37 "mesh-parser.y"
     79#line 35 "mesh-parser.y"
    8080
    8181    float fval;
  • trunk/orbital/generated/mesh-scanner.cpp

    r1424 r1425  
    463463//
    464464
     465#if defined HAVE_CONFIG_H
     466#   include "config.h"
     467#endif
     468
     469#include "core.h"
     470#include "loldebug.h"
     471
     472using namespace lol;
     473
    465474#include "../mesh-compiler.h"
    466475
     
    477486#define YY_NO_UNISTD_H
    478487#define YY_USER_ACTION yylloc->columns(yyleng);
    479 #line 480 "generated/mesh-scanner.cpp"
     488#line 489 "generated/mesh-scanner.cpp"
    480489
    481490#define INITIAL 0
     
    582591        register int yy_act;
    583592   
    584 #line 29 "mesh-scanner.l"
     593#line 38 "mesh-scanner.l"
    585594
    586595
     
    590599
    591600
    592 #line 593 "generated/mesh-scanner.cpp"
     601#line 602 "generated/mesh-scanner.cpp"
    593602
    594603        if ( !(yy_init) )
     
    671680case 1:
    672681YY_RULE_SETUP
    673 #line 36 "mesh-scanner.l"
     682#line 45 "mesh-scanner.l"
    674683{ return token::T_FLUSH; }
    675684        YY_BREAK
    676685case 2:
    677686YY_RULE_SETUP
    678 #line 37 "mesh-scanner.l"
     687#line 46 "mesh-scanner.l"
    679688{ return token::T_INITRB; }
    680689        YY_BREAK
    681690case 3:
    682691YY_RULE_SETUP
    683 #line 38 "mesh-scanner.l"
     692#line 47 "mesh-scanner.l"
    684693{ return token::T_FREERB; }
    685694        YY_BREAK
    686695case 4:
    687696YY_RULE_SETUP
    688 #line 40 "mesh-scanner.l"
     697#line 49 "mesh-scanner.l"
    689698{ return token::T_COLOR; }
    690699        YY_BREAK
    691700case 5:
    692701YY_RULE_SETUP
    693 #line 41 "mesh-scanner.l"
     702#line 50 "mesh-scanner.l"
    694703{ return token::T_BGCOLOR; }
    695704        YY_BREAK
    696705case 6:
    697706YY_RULE_SETUP
    698 #line 43 "mesh-scanner.l"
     707#line 52 "mesh-scanner.l"
    699708{ return token::T_TRANSLATEX; }
    700709        YY_BREAK
    701710case 7:
    702711YY_RULE_SETUP
    703 #line 44 "mesh-scanner.l"
     712#line 53 "mesh-scanner.l"
    704713{ return token::T_TRANSLATEY; }
    705714        YY_BREAK
    706715case 8:
    707716YY_RULE_SETUP
    708 #line 45 "mesh-scanner.l"
     717#line 54 "mesh-scanner.l"
    709718{ return token::T_TRANSLATEZ; }
    710719        YY_BREAK
    711720case 9:
    712721YY_RULE_SETUP
    713 #line 46 "mesh-scanner.l"
     722#line 55 "mesh-scanner.l"
    714723{ return token::T_TRANSLATE; }
    715724        YY_BREAK
    716725case 10:
    717726YY_RULE_SETUP
    718 #line 47 "mesh-scanner.l"
     727#line 56 "mesh-scanner.l"
    719728{ return token::T_ROTATEX; }
    720729        YY_BREAK
    721730case 11:
    722731YY_RULE_SETUP
    723 #line 48 "mesh-scanner.l"
     732#line 57 "mesh-scanner.l"
    724733{ return token::T_ROTATEY; }
    725734        YY_BREAK
    726735case 12:
    727736YY_RULE_SETUP
    728 #line 49 "mesh-scanner.l"
     737#line 58 "mesh-scanner.l"
    729738{ return token::T_ROTATEZ; }
    730739        YY_BREAK
    731740case 13:
    732741YY_RULE_SETUP
    733 #line 50 "mesh-scanner.l"
     742#line 59 "mesh-scanner.l"
    734743{ return token::T_TAPERX; }
    735744        YY_BREAK
    736745case 14:
    737746YY_RULE_SETUP
    738 #line 51 "mesh-scanner.l"
     747#line 60 "mesh-scanner.l"
    739748{ return token::T_TAPERY; }
    740749        YY_BREAK
    741750case 15:
    742751YY_RULE_SETUP
    743 #line 52 "mesh-scanner.l"
     752#line 61 "mesh-scanner.l"
    744753{ return token::T_TAPERZ; }
    745754        YY_BREAK
    746755case 16:
    747756YY_RULE_SETUP
    748 #line 53 "mesh-scanner.l"
     757#line 62 "mesh-scanner.l"
    749758{ return token::T_SCALEX; }
    750759        YY_BREAK
    751760case 17:
    752761YY_RULE_SETUP
    753 #line 54 "mesh-scanner.l"
     762#line 63 "mesh-scanner.l"
    754763{ return token::T_SCALEY; }
    755764        YY_BREAK
    756765case 18:
    757766YY_RULE_SETUP
    758 #line 55 "mesh-scanner.l"
     767#line 64 "mesh-scanner.l"
    759768{ return token::T_SCALEZ; }
    760769        YY_BREAK
    761770case 19:
    762771YY_RULE_SETUP
    763 #line 56 "mesh-scanner.l"
     772#line 65 "mesh-scanner.l"
    764773{ return token::T_SCALE; }
    765774        YY_BREAK
    766775case 20:
    767776YY_RULE_SETUP
    768 #line 57 "mesh-scanner.l"
     777#line 66 "mesh-scanner.l"
    769778{ return token::T_MIRRORX; }
    770779        YY_BREAK
    771780case 21:
    772781YY_RULE_SETUP
    773 #line 58 "mesh-scanner.l"
     782#line 67 "mesh-scanner.l"
    774783{ return token::T_MIRRORY; }
    775784        YY_BREAK
    776785case 22:
    777786YY_RULE_SETUP
    778 #line 59 "mesh-scanner.l"
     787#line 68 "mesh-scanner.l"
    779788{ return token::T_MIRRORZ; }
    780789        YY_BREAK
    781790case 23:
    782791YY_RULE_SETUP
    783 #line 61 "mesh-scanner.l"
     792#line 70 "mesh-scanner.l"
    784793{ return token::T_CYLINDER; }
    785794        YY_BREAK
    786795case 24:
    787796YY_RULE_SETUP
    788 #line 62 "mesh-scanner.l"
     797#line 71 "mesh-scanner.l"
    789798{ return token::T_BOX; }
    790799        YY_BREAK
    791800case 25:
    792801YY_RULE_SETUP
    793 #line 63 "mesh-scanner.l"
     802#line 72 "mesh-scanner.l"
    794803{ return token::T_SMOOTHCHAMFBOX; }
    795804        YY_BREAK
    796805case 26:
    797806YY_RULE_SETUP
    798 #line 64 "mesh-scanner.l"
     807#line 73 "mesh-scanner.l"
    799808{ return token::T_FLATCHAMFBOX; }
    800809        YY_BREAK
    801810case 27:
    802811YY_RULE_SETUP
    803 #line 65 "mesh-scanner.l"
     812#line 74 "mesh-scanner.l"
    804813{ return token::T_SPHERE; }
    805814        YY_BREAK
    806815case 28:
    807816YY_RULE_SETUP
    808 #line 66 "mesh-scanner.l"
     817#line 75 "mesh-scanner.l"
    809818{ return token::T_STAR; }
    810819        YY_BREAK
    811820case 29:
    812821YY_RULE_SETUP
    813 #line 67 "mesh-scanner.l"
     822#line 76 "mesh-scanner.l"
    814823{ return token::T_EXPANDEDSTAR; }
    815824        YY_BREAK
    816825case 30:
    817826YY_RULE_SETUP
    818 #line 68 "mesh-scanner.l"
     827#line 77 "mesh-scanner.l"
    819828{ return token::T_DISC; }
    820829        YY_BREAK
    821830case 31:
    822831YY_RULE_SETUP
    823 #line 69 "mesh-scanner.l"
     832#line 78 "mesh-scanner.l"
    824833{ return token::T_TRIANGLE; }
    825834        YY_BREAK
    826835case 32:
    827836YY_RULE_SETUP
    828 #line 70 "mesh-scanner.l"
     837#line 79 "mesh-scanner.l"
    829838{ return token::T_QUAD; }
    830839        YY_BREAK
    831840case 33:
    832841YY_RULE_SETUP
    833 #line 71 "mesh-scanner.l"
     842#line 80 "mesh-scanner.l"
    834843{ return token::T_COG; }
    835844        YY_BREAK
    836845case 34:
    837846YY_RULE_SETUP
    838 #line 73 "mesh-scanner.l"
     847#line 82 "mesh-scanner.l"
    839848{
    840849        yylval->fval = atof(yytext); return token::NUMBER; }
     
    842851case 35:
    843852YY_RULE_SETUP
    844 #line 75 "mesh-scanner.l"
     853#line 84 "mesh-scanner.l"
    845854{ return token_type('-'); }
    846855        YY_BREAK
    847856case 36:
    848857YY_RULE_SETUP
    849 #line 76 "mesh-scanner.l"
     858#line 85 "mesh-scanner.l"
    850859{ return token_type(','); }
    851860        YY_BREAK
     
    853862/* rule 37 can match eol */
    854863YY_RULE_SETUP
    855 #line 77 "mesh-scanner.l"
     864#line 86 "mesh-scanner.l"
    856865{ /* ignore everything else */ }
    857866        YY_BREAK
    858867case 38:
    859868YY_RULE_SETUP
    860 #line 79 "mesh-scanner.l"
     869#line 88 "mesh-scanner.l"
    861870ECHO;
    862871        YY_BREAK
    863 #line 864 "generated/mesh-scanner.cpp"
     872#line 873 "generated/mesh-scanner.cpp"
    864873case YY_STATE_EOF(INITIAL):
    865874        yyterminate();
     
    17621771#define YYTABLES_NAME "yytables"
    17631772
    1764 #line 79 "mesh-scanner.l"
     1773#line 88 "mesh-scanner.l"
    17651774
    17661775
  • trunk/orbital/gun-parser.y

    r1424 r1425  
    1919#include "../gun.h"
    2020
    21 #include <stdio.h>
    2221#include <string>
    23 #include <vector>
    2422%}
    2523
  • trunk/orbital/gun-scanner.l

    r1424 r1425  
    77//            (c) 2012 Sam Hocevar <sam@hocevar.net>
    88//
     9
     10#if defined HAVE_CONFIG_H
     11#   include "config.h"
     12#endif
     13
     14#include "core.h"
     15#include "loldebug.h"
     16
     17using namespace lol;
    918
    1019#include "../gun-compiler.h"
  • trunk/orbital/mesh-parser.y

    r1423 r1425  
    1919#include "../mesh.h"
    2020
    21 #include <stdio.h>
    2221#include <string>
    23 #include <vector>
    2422%}
    2523
  • trunk/orbital/mesh-scanner.l

    r1424 r1425  
    77//            (c) 2012 Sam Hocevar <sam@hocevar.net>
    88//
     9
     10#if defined HAVE_CONFIG_H
     11#   include "config.h"
     12#endif
     13
     14#include "core.h"
     15#include "loldebug.h"
     16
     17using namespace lol;
    918
    1019#include "../mesh-compiler.h"
Note: See TracChangeset for help on using the changeset viewer.