lex.c (do_java_lex): Renamed from java_lex.

	* lex.c (do_java_lex): Renamed from java_lex.
	(java_lex): New function.
	Include timevar.h.

From-SVN: r64586

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 46f29507fe2d054cdbc45f695e42820e064e25b2..8f0c3be7261dbe6aa6ea19b1ba8011d688fe4c7d 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-19  Tom Tromey  <tromey@redhat.com>
+
+       * lex.c (do_java_lex): Renamed from java_lex.
+       (java_lex): New function.
+       Include timevar.h.
+
 2003-03-13  Tom Tromey  <tromey@redhat.com>
 
        * parse.y (resolve_inner_class): Error if qualifier is a primitive

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index bf263ba3567fc8a987aeb9961c29118c9c8cbdb0..d18aa1b9954f39de5f8f0a6edc4a82a70577996b 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -38,12 +38,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "keyword.h"
 #include "flags.h"
 #include "chartables.h"
+#ifndef JC1_LITE
+#include "timevar.h"
+#endif
 
 /* Function declarations.  */
 static char *java_sprint_unicode (struct java_line *, int);
 static void java_unicode_2_utf8 (unicode_t);
 static void java_lex_error (const char *, int);
 #ifndef JC1_LITE
+static int do_java_lex (YYSTYPE *);
+static int java_lex (YYSTYPE *);
 static int java_is_eol (FILE *, int);
 static tree build_wfl_node (tree);
 #endif
@@ -937,7 +942,7 @@ static int
 #ifdef JC1_LITE
 yylex (YYSTYPE *java_lval)
 #else
-java_lex (YYSTYPE *java_lval)
+do_java_lex (YYSTYPE *java_lval)
 #endif
 {
   int c;
@@ -1699,6 +1704,19 @@ java_lex (YYSTYPE *java_lval)
 }
 
 #ifndef JC1_LITE
+
+/* The exported interface to the lexer.  */
+static int
+java_lex (YYSTYPE *java_lval)
+{
+  int r;
+
+  timevar_push (TV_LEX);
+  r = do_java_lex (java_lval);
+  timevar_pop (TV_LEX);
+  return r;
+}
+
 /* This is called by the parser to see if an error should be generated
    due to numeric overflow.  This function only handles the particular
    case of the largest negative value, and is only called in the case
@@ -1716,6 +1734,7 @@ error_if_numeric_overflow (tree value)
        java_lex_error ("Numeric overflow for `int' literal", 0);
     }
 }
+
 #endif /* JC1_LITE */
 
 static void