X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..48b980fed3435926e0b3a8d72ecb58be703a1c7a:/icuSources/tools/genrb/read.c

diff --git a/icuSources/tools/genrb/read.c b/icuSources/tools/genrb/read.c
index 619302ce..22cbfd65 100644
--- a/icuSources/tools/genrb/read.c
+++ b/icuSources/tools/genrb/read.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2003, International Business Machines
+*   Copyright (C) 1998-2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -30,7 +30,9 @@
 #define SPACE        0x0020
 #define COLON        0x003A
 #define BADBOM       0xFFFE
-
+#define CR           0x000D
+#define LF           0x000A
+               
 static int32_t lineCount;
 
 /* Protos */
@@ -39,9 +41,9 @@ static enum ETokenType getStringToken(UCHARBUF *buf,
                                       struct UString *token,
                                       UErrorCode *status);
 
-static UChar32 getNextChar           (UCHARBUF *buf, UBool skipwhite, UErrorCode *status);
-static void    seekUntilNewline      (UCHARBUF *buf, UErrorCode *status);
-static void    seekUntilEndOfComment (UCHARBUF *buf, UErrorCode *status);
+static UChar32 getNextChar           (UCHARBUF *buf, UBool skipwhite, struct UString *token, UErrorCode *status);
+static void    seekUntilNewline      (UCHARBUF *buf, struct UString *token, UErrorCode *status);
+static void    seekUntilEndOfComment (UCHARBUF *buf, struct UString *token, UErrorCode *status);
 static UBool   isWhitespace          (UChar32 c);
 static UBool   isNewline             (UChar32 c);
 
@@ -60,6 +62,7 @@ void resetLineNumber() {
 enum ETokenType getNextToken(UCHARBUF* buf,
                              struct UString *token,
                              uint32_t *linenumber, /* out: linenumber of token */
+                             struct UString *comment,
                              UErrorCode *status) {
     enum ETokenType result;
     UChar32         c;
@@ -69,7 +72,7 @@ enum ETokenType getNextToken(UCHARBUF* buf,
     }
 
     /* Skip whitespace */
-    c = getNextChar(buf, TRUE, status);
+    c = getNextChar(buf, TRUE, comment, status);
 
     if (U_FAILURE(*status)) {
         return TOK_ERROR;
@@ -120,6 +123,8 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
     UChar    *pTarget   = target;
     int      len=0;
     UBool    isFollowingCharEscaped=FALSE;
+    UBool    isNLUnescaped = FALSE;
+    UChar32  prevC=0;
 
     /* We are guaranteed on entry that initialChar is not a whitespace
        character. If we are at the EOF, or have some other problem, it
@@ -175,6 +180,9 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
                     if (c == U_ERR) {
                         return TOK_ERROR;
                     }
+                    if(c == CR || c == LF){
+                        isNLUnescaped = TRUE;
+                    }
                 }               
 
                 if(c==ESCAPE && !isFollowingCharEscaped){
@@ -185,11 +193,18 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
                     ustr_uscat(token, pTarget,len, status);
                     isFollowingCharEscaped = FALSE;
                     len=0;
+                    if(c == CR || c == LF){
+                        if(isNLUnescaped == FALSE && prevC!=CR){
+                            lineCount++;
+                        }
+                        isNLUnescaped = FALSE;
+                    }
                 }
                 
                 if (U_FAILURE(*status)) {
                     return TOK_ERROR;
                 }
+                prevC = c;
             }
         } else {
             if (token->fLength > 0) {
@@ -232,14 +247,14 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
             pTarget = target;
             ustr_uscat(token, pTarget,len, status);
             len=0;
-
+            
             if (U_FAILURE(*status)) {
                 return TOK_ERROR;
             }
 
             for (;;) {
                 /* DON'T skip whitespace */
-                c = getNextChar(buf, FALSE, status);
+                c = getNextChar(buf, FALSE, NULL, status);
 
                 /* EOF reached */
                 if (c == U_EOF) {
@@ -284,7 +299,7 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
         }
 
         /* DO skip whitespace */
-        c = getNextChar(buf, TRUE, status);
+        c = getNextChar(buf, TRUE, NULL, status);
 
         if (U_FAILURE(*status)) {
             return TOK_STRING;
@@ -297,12 +312,13 @@ static enum ETokenType getStringToken(UCHARBUF* buf,
     }
 }
 
-/* Retrieve the next character, ignoring comments.  If skipwhite is
+/* Retrieve the next character.  If skipwhite is
    true, whitespace is skipped as well. */
 static UChar32 getNextChar(UCHARBUF* buf,
                            UBool skipwhite,
+                           struct UString *token,
                            UErrorCode *status) {
-    UChar32 c;
+    UChar32 c, c2;
 
     if (U_FAILURE(*status)) {
         return U_EOF;
@@ -324,30 +340,39 @@ static UChar32 getNextChar(UCHARBUF* buf,
             return c;
         }
 
-        c = ucbuf_getc(buf,status);
+        c = ucbuf_getc(buf,status); /* "/c" */
 
         if (c == U_EOF) {
             return U_EOF;
         }
 
         switch (c) {
-        case SLASH:
-            seekUntilNewline(buf, status);
+        case SLASH:  /* "//" */
+            seekUntilNewline(buf, NULL, status);
             break;
 
-        case ASTERISK:
-            seekUntilEndOfComment(buf, status);
+        case ASTERISK:  /* "/*" */
+            c2 = ucbuf_getc(buf, status); /* "/*c" */
+            if(c2 == ASTERISK){  /* "/**" */
+                /* parse multi-line comment and store it in token*/
+                seekUntilEndOfComment(buf, token, status);
+            } else {
+                ucbuf_ungetc(c2, buf); /* c2 is the non-asterisk following "/*".  Include c2  back in buffer.  */
+                seekUntilEndOfComment(buf, NULL, status);
+            }
             break;
 
         default:
-            ucbuf_ungetc(c, buf);
+            ucbuf_ungetc(c, buf); /* "/c" - put back the c */
             /* If get() failed this is a NOP */
             return SLASH;
         }
+
     }
 }
 
 static void seekUntilNewline(UCHARBUF* buf,
+                             struct UString *token,
                              UErrorCode *status) {
     UChar32 c;
 
@@ -357,10 +382,15 @@ static void seekUntilNewline(UCHARBUF* buf,
 
     do {
         c = ucbuf_getc(buf,status);
+        /* add the char to token */
+        if(token!=NULL){
+            ustr_u32cat(token, c, status);
+        }
     } while (!isNewline(c) && c != U_EOF && *status == U_ZERO_ERROR);
 }
 
 static void seekUntilEndOfComment(UCHARBUF *buf,
+                                  struct UString *token,
                                   UErrorCode *status) {
     UChar32  c, d;
     uint32_t line;
@@ -383,6 +413,13 @@ static void seekUntilEndOfComment(UCHARBUF *buf,
                 break;
             }
         }
+        /* add the char to token */
+        if(token!=NULL){
+            ustr_u32cat(token, c, status);
+        }
+        /* increment the lineCount */
+        isNewline(c);
+
     } while (c != U_EOF && *status == U_ZERO_ERROR);
 
     if (c == U_EOF) {