commit 84ef7eced2ab45000efc05c70a2b29fc782d639f
author Piotr Caban <piotr.caban@gmail.com> Thu Apr 09 23:34:26 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 10 11:33:35 2009 +0200
tree 2e9e5b8f38dfb1b914486fa43ae206d4f4aa0035
parent 754b5cf2adc73a917d7d60c35d5cad5897a5e92d

jscript: Added html comments handling.

dlls/jscript/lex.c

diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index bf298bf..68bfef8 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -174,6 +174,20 @@
     }
 }
 
+static BOOL skip_html_comment(parser_ctx_t *ctx)
+{
+    const WCHAR html_commentW[] = {'<','!','-','-',0};
+
+    if(!ctx->is_html || ctx->ptr+3 >= ctx->end ||
+        memcmp(ctx->ptr, html_commentW, sizeof(WCHAR)*4))
+        return FALSE;
+
+    ctx->nl = TRUE;
+    while(ctx->ptr < ctx->end && !is_endline(*ctx->ptr++));
+
+    return TRUE;
+}
+
 static BOOL skip_comment(parser_ctx_t *ctx)
 {
     if(ctx->ptr+1 >= ctx->end || *ctx->ptr != '/')
@@ -466,13 +480,13 @@
 {
     int ret;
 
-    ctx->nl = FALSE;
+    ctx->nl = ctx->ptr == ctx->begin;
 
     do {
         skip_spaces(ctx);
         if(ctx->ptr == ctx->end)
             return 0;
-    }while(skip_comment(ctx));
+    }while(skip_comment(ctx) || skip_html_comment(ctx));
 
     if(isalphaW(*ctx->ptr)) {
         ret = check_keywords(ctx, lval);
@@ -585,8 +599,12 @@
         ctx->ptr++;
         if(ctx->ptr < ctx->end) {
             switch(*ctx->ptr) {
-            case '-':  /* -- */
+            case '-':  /* -- or --> */
                 ctx->ptr++;
+                if(ctx->is_html && ctx->nl && ctx->ptr < ctx->end && *ctx->ptr == '>') {
+                    ctx->ptr++;
+                    return tHTMLCOMMENT;
+                }
                 return tDEC;
             case '=':  /* -= */
                 ctx->ptr++;