Changeset 609 for branches/GNU/src/binutils/ld/ldlex.l

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/ld/ldlex.l (modified) (16 diffs, 1 prop)

branches/GNU/src/binutils/ld/ldlex.l

@@ -1 +1 @@
 %{
 
-/* Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-   Free Software Foundation, Inc.
+/* Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002  Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -27 +27 @@
 
 
-#include <ansidecl.h>
+#include "ansidecl.h"
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef MPW
@@ -38 +37 @@
 #include "bfd.h"
 #include "sysdep.h"
+#include "safe-ctype.h"
+#include "bfdlink.h"
 #include "ld.h"
-#include "ldgram.h"
 #include "ldmisc.h"
 #include "ldexp.h"
 #include "ldlang.h"
+#include <ldgram.h>
 #include "ldfile.h"
 #include "ldlex.h"
@@ -117 +118 @@
 
 V_TAG [.$_a-zA-Z][._a-zA-Z0-9]*
-V_IDENTIFIER [*?.$_a-zA-Z]([*?.$_a-zA-Z0-9]|::)*
+V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^]([*?.$_a-zA-Z0-9\[\]\-\!\^]|::)*
 
 %s SCRIPT
@@ -144 +145 @@
     }
 
-<BOTH,SCRIPT,EXPRESSION>"/*"    { comment(); }
+<BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT>"/*"   { comment(); }
 
 
@@ -154 +155 @@
 <MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
                                 yylval.integer = bfd_scan_vma (yytext+1, 0,16);
+                                yylval.bigint.str = (char *) 0;
                                 return INT;
                         }
@@ -179 +181 @@
                                    yylval.integer = bfd_scan_vma (yytext, 0,
                                                                   ibase);
+                                   yylval.bigint.str = (char *) 0;
                                    return INT;
                                  }
-<SCRIPT,DEFSYMEXP,MRI,BOTH,EXPRESSION>((("$"|"0x")([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
+<SCRIPT,DEFSYMEXP,MRI,BOTH,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
                                   char *s = yytext;
+                                  int ibase = 0;
 
                                   if (*s == '$')
-                                    ++s;
-                                  yylval.integer = bfd_scan_vma (s, 0, 0);
+                                    {
+                                      ++s;
+                                      ibase = 16;
+                                    }
+                                  yylval.integer = bfd_scan_vma (s, 0, ibase);
+                                  yylval.bigint.str = (char *) 0;
                                   if (yytext[yyleng-1] == 'M'
                                       || yytext[yyleng-1] == 'm')
-                                    yylval.integer *= 1024 * 1024;
-                                  if (yytext[yyleng-1] == 'K' 
+                                    {
+                                      yylval.integer *= 1024 * 1024;
+                                    }
+                                  else if (yytext[yyleng-1] == 'K' 
                                       || yytext[yyleng-1]=='k')
-                                    yylval.integer *= 1024;
+                                    {
+                                      yylval.integer *= 1024;
+                                    }
+                                  else if (yytext[0] == '0'
+                                           && (yytext[1] == 'x'
+                                               || yytext[1] == 'X'))
+                                    {
+                                      yylval.bigint.str = xstrdup (yytext + 2);
+                                    }
                                   return INT;
                                 }
@@ -240 +258 @@
 <BOTH,SCRIPT>"LENGTH"           { RTOKEN(LENGTH);}
 <EXPRESSION,BOTH,SCRIPT>"ALIGN"                 { RTOKEN(ALIGN_K);}
+<EXPRESSION,BOTH,SCRIPT>"DATA_SEGMENT_ALIGN"    { RTOKEN(DATA_SEGMENT_ALIGN);}
+<EXPRESSION,BOTH,SCRIPT>"DATA_SEGMENT_END"      { RTOKEN(DATA_SEGMENT_END);}
 <EXPRESSION,BOTH,SCRIPT>"ADDR"                  { RTOKEN(ADDR);}
 <EXPRESSION,BOTH,SCRIPT>"LOADADDR"              { RTOKEN(LOADADDR);}
@@ -261 +281 @@
 <BOTH,SCRIPT>"CONSTRUCTORS"             { RTOKEN( CONSTRUCTORS);}
 <BOTH,SCRIPT>"FORCE_COMMON_ALLOCATION" { RTOKEN(FORCE_COMMON_ALLOCATION);}
+<BOTH,SCRIPT>"INHIBIT_COMMON_ALLOCATION" { RTOKEN(INHIBIT_COMMON_ALLOCATION);}
 <BOTH,SCRIPT>"SECTIONS"         { RTOKEN(SECTIONS);}
 <BOTH,SCRIPT>"FILL"                     { RTOKEN(FILL);}
@@ -418 +439 @@
   {
     yy_switch_to_buffer(include_stack[include_stack_ptr]);
-
   }
-  BEGIN(SCRIPT);
+
   ldfile_input_filename = file_name_stack[include_stack_ptr - 1];
-  lineno = lineno_stack[include_stack_ptr - 1];
+  lineno = lineno_stack[include_stack_ptr];
 
   return END;
@@ -447 +467 @@
     }
   file_name_stack[include_stack_ptr] = name;
-  lineno_stack[include_stack_ptr] = 1;
+  lineno_stack[include_stack_ptr] = lineno;
   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
 
   include_stack_ptr++;
+  lineno = 1;
   yyin = file;
   yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
-  BEGIN (SCRIPT);
 }
 
@@ -461 +481 @@
 static YY_BUFFER_STATE 
 yy_create_string_buffer (string, size)
-     CONST char *string;
+     const char *string;
      size_t size;
 {
@@ -503 +523 @@
 void
 lex_redirect (string)
-     CONST char *string;
+     const char *string;
 {
   YY_BUFFER_STATE tmp;
@@ -513 +533 @@
     }
   file_name_stack[include_stack_ptr] = "redirect";
-  lineno_stack[include_stack_ptr] = 0;
+  lineno_stack[include_stack_ptr] = lineno;
   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
   include_stack_ptr++;
+  lineno = 1;
   tmp = yy_create_string_buffer (string, strlen (string));
   yy_switch_to_buffer (tmp);
-  BEGIN (SCRIPT);
 }
 
@@ -595 +615 @@
 {
   *result = 0; 
-  if (yy_current_buffer->yy_input_file)
+  if (YY_CURRENT_BUFFER->yy_input_file)
     {
       if (yyin)
         {
-          *result = read (fileno (yyin), (char *) buf, max_size);
-          if (*result < 0) 
+          *result = fread ((char *) buf, 1, max_size, yyin);
+          if (*result < max_size && ferror (yyin)) 
             einfo ("%F%P: read in flex scanner failed\n");
         }
@@ -662 +682 @@
     }
 
-  if (! isprint ((unsigned char) *what))
+  if (! ISPRINT (*what))
     {
       sprintf (buf, "\\%03o", (unsigned int) *what);