TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff

   1 --- lex.CC_command.cpp.orig     Mon Nov 12 19:05:12 2001
   2 +++ lex.CC_command.cpp  Mon Nov 12 19:14:49 2001
   3 @@ -220,10 +220,13 @@
   4  static int ace_cc_yy_init = 1;         /* whether we need to initialize */
   5  static int ace_cc_yy_start = 0;        /* start state number */
   6
   7 +#define ace_cc_yywrap() 1
   8  /* Flag which is used to allow ace_cc_yywrap()'s to do buffer switches
   9   * instead of setting up a fresh ace_cc_yyin.  A bit of a hack ...
  10   */
  11 +#if (ace_cc_yywrap() != 1)
  12  static int ace_cc_yy_did_buffer_switch_on_eof;
  13 +#endif
  14
  15  void ace_cc_yyrestart ACE_CC_YY_PROTO(( FILE *input_file ));
  16
  17 @@ -262,7 +265,6 @@
  18  #define ACE_CC_YY_AT_BOL() (ace_cc_yy_current_buffer->ace_cc_yy_at_bol)
  19
  20
  21 -#define ace_cc_yywrap() 1
  22  #define ACE_CC_YY_SKIP_ACE_CC_YYWRAP
  23  typedef unsigned char ACE_CC_YY_CHAR;
  24  FILE *ace_cc_yyin = (FILE *) 0, *ace_cc_yyout = (FILE *) 0;
  25 @@ -644,6 +646,8 @@
  26                 ace_cc_yy_load_buffer_state();
  27                 }
  28
  29 +        ace_cc_yy_cp = ace_cc_yy_bp = 0; /* To avoid g++ warning about
  30 +                                            possible uninitialized use. */
  31         while ( 1 )             /* loops until end-of-file is reached */
  32                 {
  33                 ace_cc_yy_cp = ace_cc_yy_c_buf_p;
  34 @@ -705,90 +709,90 @@
  35  case 1:
  36  ACE_CC_YY_RULE_SETUP
  37  return T_TERM;
  38 -       ACE_CC_YY_BREAK
  39 +       /* ACE_CC_YY_BREAK */
  40  case 2:
  41  ACE_CC_YY_RULE_SETUP
  42  return T_START_CMD;
  43 -       ACE_CC_YY_BREAK
  44 +       /* ACE_CC_YY_BREAK */
  45  case 3:
  46  ACE_CC_YY_RULE_SETUP
  47  return T_CREATE_CMD;
  48 -       ACE_CC_YY_BREAK
  49 +       /* ACE_CC_YY_BREAK */
  50  case 4:
  51  ACE_CC_YY_RULE_SETUP
  52  return T_LOCK_CMD;
  53 -       ACE_CC_YY_BREAK
  54 +       /* ACE_CC_YY_BREAK */
  55  case 5:
  56  ACE_CC_YY_RULE_SETUP
  57  return T_UNLOCK_CMD;
  58 -       ACE_CC_YY_BREAK
  59 +       /* ACE_CC_YY_BREAK */
  60  case 6:
  61  ACE_CC_YY_RULE_SETUP
  62  return T_TRYLOCK_CMD;
  63 -       ACE_CC_YY_BREAK
  64 +       /* ACE_CC_YY_BREAK */
  65  case 7:
  66  ACE_CC_YY_RULE_SETUP
  67  return T_CHANGEMODE_CMD;
  68 -       ACE_CC_YY_BREAK
  69 +       /* ACE_CC_YY_BREAK */
  70  case 8:
  71  ACE_CC_YY_RULE_SETUP
  72  return T_SLEEP_CMD;
  73 -       ACE_CC_YY_BREAK
  74 +       /* ACE_CC_YY_BREAK */
  75  case 9:
  76  ACE_CC_YY_RULE_SETUP
  77  return T_WAIT_CMD;
  78 -       ACE_CC_YY_BREAK
  79 +       /* ACE_CC_YY_BREAK */
  80  case 10:
  81  ACE_CC_YY_RULE_SETUP
  82  return T_PRINT_CMD;
  83 -       ACE_CC_YY_BREAK
  84 +       /* ACE_CC_YY_BREAK */
  85  case 11:
  86  ACE_CC_YY_RULE_SETUP
  87  return T_REPEAT_CMD;
  88 -       ACE_CC_YY_BREAK
  89 +       /* ACE_CC_YY_BREAK */
  90  case 12:
  91  ACE_CC_YY_RULE_SETUP
  92  return T_EXCEP_CMD;
  93 -       ACE_CC_YY_BREAK
  94 +       /* ACE_CC_YY_BREAK */
  95  case 13:
  96  ACE_CC_YY_RULE_SETUP
  97  return T_LOOKUP_CMD;
  98 -       ACE_CC_YY_BREAK
  99 +       /* ACE_CC_YY_BREAK */
 100  case 14:
 101  ACE_CC_YY_RULE_SETUP
 102  return T_READ;
 103 -       ACE_CC_YY_BREAK
 104 +       /* ACE_CC_YY_BREAK */
 105  case 15:
 106  ACE_CC_YY_RULE_SETUP
 107  return T_IREAD;
 108 -       ACE_CC_YY_BREAK
 109 +       /* ACE_CC_YY_BREAK */
 110  case 16:
 111  ACE_CC_YY_RULE_SETUP
 112  return T_UPGRADE;
 113 -       ACE_CC_YY_BREAK
 114 +       /* ACE_CC_YY_BREAK */
 115  case 17:
 116  ACE_CC_YY_RULE_SETUP
 117  return T_WRITE;
 118 -       ACE_CC_YY_BREAK
 119 +       /* ACE_CC_YY_BREAK */
 120  case 18:
 121  ACE_CC_YY_RULE_SETUP
 122  return T_IWRITE;
 123 -       ACE_CC_YY_BREAK
 124 +       /* ACE_CC_YY_BREAK */
 125  case 19:
 126  ACE_CC_YY_RULE_SETUP
 127  { ace_cc_yylval.id = ACE_OS::strdup(&ace_cc_yytext[1]);
 128                          ace_cc_yylval.id[ace_cc_yyleng-2]='\0';
 129                          return Q_STRING; }
 130 -       ACE_CC_YY_BREAK
 131 +       /* ACE_CC_YY_BREAK */
 132  case 20:
 133  ACE_CC_YY_RULE_SETUP
 134  { ace_cc_yylval.num = atoi(ace_cc_yytext); return T_NUM; }
 135 -       ACE_CC_YY_BREAK
 136 +       /* ACE_CC_YY_BREAK */
 137  case 21:
 138  ACE_CC_YY_RULE_SETUP
 139  { ace_cc_yylval.id = ACE_OS::strdup(ace_cc_yytext);
 140                             return T_IDENT; }
 141 -       ACE_CC_YY_BREAK
 142 +       /* ACE_CC_YY_BREAK */
 143  case 22:
 144  ACE_CC_YY_RULE_SETUP
 145  { }
 146 @@ -882,7 +886,9 @@
 147                         {
 148                         case EOB_ACT_END_OF_FILE:
 149                                 {
 150 +#if (ace_cc_yywrap() != 1)
 151                                 ace_cc_yy_did_buffer_switch_on_eof = 0;
 152 +#endif
 153
 154                                 if ( ace_cc_yywrap() )
 155                                         {
 156 @@ -903,8 +909,10 @@
 157
 158                                 else
 159                                         {
 160 +#if (ace_cc_yywrap() != 1)
 161                                         if ( ! ace_cc_yy_did_buffer_switch_on_eof )
 162                                                 ACE_CC_YY_NEW_FILE;
 163 +#endif
 164                                         }
 165                                 break;
 166                                 }
 167 @@ -1188,7 +1196,7 @@
 168         }
 169  #endif /* ifndef ACE_CC_YY_NO_UNPUT */
 170
 171 -
 172 +#ifndef ACE_CC_YY_NO_INPUT
 173  #ifdef __cplusplus
 174  static int ace_cc_yyinput()
 175  #else
 176 @@ -1237,13 +1245,13 @@
 177                                         if ( ace_cc_yywrap() )
 178                                                 return EOF;
 179
 180 -                                       if ( ! ace_cc_yy_did_buffer_switch_on_eof )
 181 +                                        /*                                     if ( ! ace_cc_yy_did_buffer_switch_on_eof )
 182                                                 ACE_CC_YY_NEW_FILE;
 183  #ifdef __cplusplus
 184                                         return ace_cc_yyinput();
 185  #else
 186                                         return input();
 187 -#endif
 188 +                                        #endif */
 189                                         }
 190
 191                                 case EOB_ACT_CONTINUE_SCAN:
 192 @@ -1261,6 +1269,7 @@
 193
 194         return c;
 195         }
 196 +#endif /* ! ACE_CC_YY_NO_INPUT */
 197
 198
 199  #ifdef ACE_CC_YY_USE_PROTOS
 200 @@ -1304,7 +1313,9 @@
 201          * is looked at is after ace_cc_yywrap() is called, so it's safe
 202          * to go ahead and always set it.
 203          */
 204 +#if (ace_cc_yywrap() != 1)
 205         ace_cc_yy_did_buffer_switch_on_eof = 1;
 206 +#endif
 207         }
 208
 209