[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs

2007-05-22 Thread Chris Lattner


Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.43 - 1.44
Lexer.l.cvs updated: 1.35 - 1.36
---
Log message:

regenerate


---
Diffs of the changes:  (+162 -185)

 Lexer.cpp.cvs |  334 +++---
 Lexer.l.cvs   |   13 --
 2 files changed, 162 insertions(+), 185 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.43 
llvm/lib/AsmParser/Lexer.cpp.cvs:1.44
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.43   Sat May 19 02:22:10 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvsTue May 22 01:47:55 2007
@@ -17,10 +17,10 @@
 #define yylineno llvmAsmlineno
 
 #line 20 Lexer.cpp
-/* A lexical scanner generated by flex*/
+/* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/vadve/shared/PublicCVS/llvm/lib/AsmParser/Lexer.cpp.cvs,v 
1.43 2007/05/19 07:22:10 reid Exp $
+ * $Header: /home/vadve/shared/PublicCVS/llvm/lib/AsmParser/Lexer.cpp.cvs,v 
1.44 2007/05/22 06:47:55 lattner Exp $
  */
 
 #define FLEX_SCANNER
@@ -28,7 +28,6 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include stdio.h
-#include unistd.h
 
 
 /* cfront 1.2 defines c_plusplus instead of __cplusplus */
@@ -42,6 +41,7 @@
 #ifdef __cplusplus
 
 #include stdlib.h
+#include unistd.h
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -153,15 +153,6 @@
 
 #define unput(c) yyunput( c, yytext_ptr )
 
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
-
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -268,7 +259,7 @@
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) 
YY_MAY_BE_UNUSED;
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -890,7 +881,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 1 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --*- C++ 
-*--===//
 //
@@ -905,9 +896,10 @@
 //
 
//===--===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 28 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 #include ParserInternals.h
 #include llvm/Module.h
+#include llvm/Support/MathExtras.h
 #include list
 #include llvmAsmParser.h
 #include cctype
@@ -976,17 +968,7 @@
 // point representation of it.
 //
 static double HexToFP(const char *Buffer) {
-  // Behave nicely in the face of C TBAA rules... see:
-  // http://www.nullstone.com/htmls/category/aliastyp.htm
-  union {
-uint64_t UI;
-double FP;
-  } UIntToFP;
-  UIntToFP.UI = HexIntToVal(Buffer);
-
-  assert(sizeof(double) == sizeof(uint64_t) 
- Data sizes incompatible on this target!);
-  return UIntToFP.FP;   // Cast Hex constant to double
+  return BitsToDouble(HexIntToVal(Buffer));   // Cast Hex constant to double
 }
 
 
@@ -1038,7 +1020,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1042 Lexer.cpp
+#line 1024 Lexer.cpp
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1186,13 +1168,13 @@
 YY_DECL
{
register yy_state_type yy_current_state;
-   register char *yy_cp = NULL, *yy_bp = NULL;
+   register char *yy_cp, *yy_bp;
register int yy_act;
 
-#line 191 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 182 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 
 
-#line 1196 Lexer.cpp
+#line 1178 Lexer.cpp
 
if ( yy_init )
{
@@ -1285,272 +1267,272 @@
{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 193 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 184 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 { /* Ignore comments for now */ }
YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 195 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 186 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 { return BEGINTOK; }
YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 196 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 187 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 { return ENDTOK; }
YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 197 /proj/llvm/llvm-2/lib/AsmParser/Lexer.l
+#line 188 /Users/sabre/cvs/llvm/lib/AsmParser/Lexer.l
 { return TRUETOK;  }
 

[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs

2007-05-22 Thread Reid Spencer


Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.46 - 1.47
Lexer.l.cvs updated: 1.38 - 1.39
---
Log message:

Regenerate.


---
Diffs of the changes:  (+186 -168)

 Lexer.cpp.cvs |  323 +-
 Lexer.l.cvs   |   31 +++--
 2 files changed, 186 insertions(+), 168 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.46 
llvm/lib/AsmParser/Lexer.cpp.cvs:1.47
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.46   Tue May 22 13:52:55 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvsTue May 22 14:08:16 2007
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.46 2007/05/22 
18:52:55 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.47 2007/05/22 
19:08:16 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -983,15 +983,22 @@
 
 // UnEscapeLexed - Run through the specified buffer and change \xx codes to the
 // appropriate character.
-char *UnEscapeLexed(char *Buffer) {
+char *UnEscapeLexed(char *Buffer, char* EndBuffer) {
   char *BOut = Buffer;
   for (char *BIn = Buffer; *BIn; ) {
-if (BIn[0] == '\\'  isxdigit(BIn[1])  isxdigit(BIn[2])) {
-  char Tmp = BIn[3]; BIn[3] = 0;  // Terminate string
-  *BOut = (char)strtol(BIn+1, 0, 16); // Convert to number
-  BIn[3] = Tmp;   // Restore character
-  BIn += 3;   // Skip over handled chars
-  ++BOut;
+if (BIn[0] == '\\') {
+  if (BIn  EndBuffer-1  BIn[1] == '\\') {
+*BOut++ = '\\'; // Two \ becomes one
+BIn += 2;
+  } else if (BIn  EndBuffer-2  isxdigit(BIn[1])  isxdigit(BIn[2])) {
+char Tmp = BIn[3]; BIn[3] = 0;  // Terminate string
+*BOut = (char)strtol(BIn+1, 0, 16); // Convert to number
+BIn[3] = Tmp;   // Restore character
+BIn += 3;   // Skip over handled chars
+++BOut;
+  } else {
+*BOut++ = *BIn++;
+  }
 } else {
   *BOut++ = *BIn++;
 }
@@ -1020,7 +1027,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1024 Lexer.cpp
+#line 1031 Lexer.cpp
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1171,10 +1178,10 @@
register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
 
-#line 173 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 180 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 
 
-#line 1178 Lexer.cpp
+#line 1185 Lexer.cpp
 
if ( yy_init )
{
@@ -1267,272 +1274,272 @@
{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 175 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 182 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { /* Ignore comments for now */ }
YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 177 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 184 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return BEGINTOK; }
YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 178 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 185 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return ENDTOK; }
YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 179 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 186 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return TRUETOK;  }
YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 180 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 187 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return FALSETOK; }
YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 181 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 188 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return DECLARE; }
YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 182 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 189 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return DEFINE; }
YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 183 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 190 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return GLOBAL; }
YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 184 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 191 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return CONSTANT; }
YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 185 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 192 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return INTERNAL; }
YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 186 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 193 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return LINKONCE; }
YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 187 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 194 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return WEAK; }
YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 188 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
+#line 195 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return APPENDING; }
YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 189 

[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs

2007-03-09 Thread Reid Spencer


Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.32 - 1.33
Lexer.l.cvs updated: 1.26 - 1.27
---
Log message:

Regenerate.


---
Diffs of the changes:  (+3 -3)

 Lexer.cpp.cvs |4 ++--
 Lexer.l.cvs   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.32 
llvm/lib/AsmParser/Lexer.cpp.cvs:1.33
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.32   Tue Feb 27 20:24:54 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvsFri Mar  9 15:19:09 2007
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.32 2007/02/28 
02:24:54 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.33 2007/03/09 
21:19:09 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -1940,7 +1940,7 @@
 YY_RULE_SETUP
 #line 379 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
 { int len = strlen(yytext); 
-  uint32_t numBits = (((len-1) * 64) / 19) + 1;
+  uint32_t numBits = (((len-1) * 64) / 19) + 2;
   APInt Tmp(numBits, yytext, len, 10);
   uint32_t minBits = Tmp.getMinSignedBits();
   if (minBits  0  minBits  numBits)


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.26 llvm/lib/AsmParser/Lexer.l.cvs:1.27
--- llvm/lib/AsmParser/Lexer.l.cvs:1.26 Tue Feb 27 20:24:54 2007
+++ llvm/lib/AsmParser/Lexer.l.cvs  Fri Mar  9 15:19:09 2007
@@ -377,7 +377,7 @@
   }
 }
 {NInteger}  { int len = strlen(yytext); 
-  uint32_t numBits = (((len-1) * 64) / 19) + 1;
+  uint32_t numBits = (((len-1) * 64) / 19) + 2;
   APInt Tmp(numBits, yytext, len, 10);
   uint32_t minBits = Tmp.getMinSignedBits();
   if (minBits  0  minBits  numBits)



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs

2007-01-11 Thread Reid Spencer


Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.23 - 1.24
Lexer.l.cvs updated: 1.19 - 1.20
---
Log message:

Regenerate.


---
Diffs of the changes:  (+78 -78)

 Lexer.cpp.cvs |  154 +-
 Lexer.l.cvs   |2 
 2 files changed, 78 insertions(+), 78 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.23 
llvm/lib/AsmParser/Lexer.cpp.cvs:1.24
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.23   Fri Jan 12 01:05:13 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvsFri Jan 12 01:28:27 2007
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.23 2007/01/12 
07:05:13 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.24 2007/01/12 
07:28:27 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -319,97 +319,97 @@
 
 #define YY_NUM_RULES 135
 #define YY_END_OF_BUFFER 136
-static yyconst short int yy_acclist[214] =
+static yyconst short int yy_acclist[213] =
 {   0,
   136,  134,  135,  133,  134,  135,  133,  135,  134,  135,
   134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
   126,  134,  135,  126,  134,  135,1,  134,  135,  134,
   135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-  135,  134,  135,   53,  134,  135,  134,  135,  134,  135,
-  134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
-  134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
-  134,  135,  125,  123,  122,  122,  129,  127,  131,  126,
-1,  108,   39,   68,   53,   69,   64,   23,  125,  122,
-  122,  130,  131,   20,  131,  132,   54,   63,   37,   32,
-
-   40,3,   56,   78,   83,   81,   82,   80,   79,   84,
-   88,  107,   73,   71,  103,   72,   70,   55,   86,   77,
-   75,   76,   74,   87,   85,   65,  124,  131,  131,  105,
-   47,   89,   67,   59,  115,   62,   66,  116,  104,   22,
-  128,   58,   92,   61,   24,4,   51,   57,   60,   46,
-   12,   91,  131,   34,2,5,   48,   94,   50,  117,
-   90,   21,  114,   43,7,   49,   28,   42,   98,   97,
-8,  110,   31,  113,   36,   52,  102,   96,  109,   25,
-   26,   95,  111,  106,  101,   41,6,   27,   93,   35,
-9,   17,   10,   99,   11,  100,   33,   13,   15,   14,
+  135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+  135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+  135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+  135,  125,  123,  122,  122,  129,  127,  131,  126,1,
+  108,   39,   68,   53,   69,   64,   23,  125,  122,  122,
+  130,  131,   20,  131,  132,   54,   63,   37,   32,   40,
+
+3,   56,   78,   83,   81,   82,   80,   79,   84,   88,
+  107,   73,   71,  103,   72,   70,   55,   86,   77,   75,
+   76,   74,   87,   85,   65,  124,  131,  131,  105,   47,
+   89,   67,   59,  115,   62,   66,  116,  104,   22,  128,
+   58,   92,   61,   24,4,   51,   57,   60,   46,   12,
+   91,  131,   34,2,5,   48,   94,   50,  117,   90,
+   21,  114,   43,7,   49,   28,   42,   98,   97,8,
+  110,   31,  113,   36,   52,  102,   96,  109,   25,   26,
+   95,  111,  106,  101,   41,6,   27,   93,   35,9,
+   17,   10,   99,   11,  100,   33,   13,   15,   14,   30,
 
-   30,   38,   16,   29,  112,  118,  120,  121,   44,  119,
-   18,   45,   19
+   38,   16,   29,  112,  118,  120,  121,   44,  119,   18,
+   45,   19
 } ;
 
 static yyconst short int yy_accept[552] =
 {   0,
 1,1,1,2,4,7,9,   11,   13,   15,
17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-   40,   42,   44,   47,   49,   51,   53,   55,   57,   59,
-   61,   63,   65,   67,   69,   71,   73,   73,   74,   74,
-   75,   76,   77,   78,   78,   79,   79,   80,   81,   81,
-   82,   82,   82,   82,   82,   82,   82,   82,   82,   83,
-   83,   84,   84,   84,   84,   84,   84,   84,   84,   85,
-   85,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-   87,   87,   87,   87,   87,   87,   87,   88,   88,   88,
+   40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
+   60,   62,   64,   66,   68,   70,   72,   72,   73,   73,
+   74,   75,   76,   77,   77,   78,   78,   79,   80,   80,
+   81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
+   82,   83,   83,   83,   83,   83,   83,   83,   83,   84,
+   84,   84,   84,   84,   84,   84,   84,   84,   84,   85,
+   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+   86,   86,   86,   86,   86,   86,   86,   87,   87,   87,
 
+   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
+   87,   87,   

[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs llvmAsmParser.cpp.cvs llvmAsmParser.y.cvs

2006-11-30 Thread Reid Spencer


Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.15 - 1.16
Lexer.l.cvs updated: 1.11 - 1.12
llvmAsmParser.cpp.cvs updated: 1.27 - 1.28
llvmAsmParser.y.cvs updated: 1.28 - 1.29
---
Log message:

Regenerate.


---
Diffs of the changes:  (+185 -197)

 Lexer.cpp.cvs |  326 --
 Lexer.l.cvs   |   40 ++
 llvmAsmParser.cpp.cvs |8 -
 llvmAsmParser.y.cvs   |8 -
 4 files changed, 185 insertions(+), 197 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.15 
llvm/lib/AsmParser/Lexer.cpp.cvs:1.16
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.15   Sun Nov 26 19:05:09 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvsThu Nov 30 18:33:46 2006
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.15 2006/11/27 
01:05:09 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.16 2006/12/01 
00:33:46 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -893,7 +893,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 1 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --*- C++ 
-*--===//
 //
@@ -908,7 +908,7 @@
 //
 
//===--===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 28 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 #include ParserInternals.h
 #include llvm/Module.h
 #include list
@@ -935,17 +935,11 @@
   llvmAsmlval.type.obsolete = true; \
   return sym
 
-// Construct a token value for a non-obsolete type
-#define RET_TY(CType, sym) \
-  llvmAsmlval.TypeVal.type = new PATypeHolder(CType); \
-  llvmAsmlval.TypeVal.signedness = isSignless; \
-  return sym
-
 // Construct a token value for an obsolete token
-#define RET_TY_OBSOLETE(CType, sign, sym) \
-  llvmAsmlval.TypeVal.type = new PATypeHolder(CType); \
-  llvmAsmlval.TypeVal.signedness = sign; \
-  return sym
+#define RET_TY(CTYPE, SIGN, SYM) \
+  llvmAsmlval.TypeVal.type = new PATypeHolder(CTYPE); \
+  llvmAsmlval.TypeVal.signedness = SIGN; \
+  return SYM
 
 namespace llvm {
 
@@ -1055,7 +1049,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1059 Lexer.cpp
+#line 1053 Lexer.cpp
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1206,10 +1200,10 @@
register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
 
-#line 200 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 194 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 
 
-#line 1213 Lexer.cpp
+#line 1207 Lexer.cpp
 
if ( yy_init )
{
@@ -1302,607 +1296,607 @@
{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 202 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 196 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { /* Ignore comments for now */ }
YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 204 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 198 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return BEGINTOK; }
YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 205 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 199 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return ENDTOK; }
YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 206 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 200 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return TRUETOK;  }
YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 207 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 201 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return FALSETOK; }
YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 208 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 202 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return DECLARE; }
YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 209 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 203 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return GLOBAL; }
YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 210 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 204 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return CONSTANT; }
YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 211 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 205 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return INTERNAL; }
YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 212 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 206 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return LINKONCE; }
YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 213 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 207 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return WEAK; }
YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 214 /proj/llvm/llvm-1/lib/AsmParser/Lexer.l
+#line 208 /proj/llvm/llvm-4/lib/AsmParser/Lexer.l
 { return APPENDING; }
YY_BREAK
 case