commit 5760eb808b17a8c80bbb42ea128499ace84b69af
author Jacek Caban <jacek@codeweavers.com> Sun Sep 21 15:47:47 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 22 11:56:16 2008 +0200
tree 5b5e4e4b2b5e4d0d15af8cc06989b07572f17661
parent 68bd72c7cd28bf1f1f80eb2f3d4f0091a2b74dda

jscript: Added Function.toString implementation.

dlls/jscript/lex.c

diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index ba80154..4ad9fe5 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -101,7 +101,7 @@
     return -1;
 }
 
-static int check_keyword(parser_ctx_t *ctx, const WCHAR *word)
+static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval)
 {
     const WCHAR *p1 = ctx->ptr;
     const WCHAR *p2 = word;
@@ -116,6 +116,7 @@
     if(*p2 || (p1 < ctx->end && isalnumW(*p1)))
         return 1;
 
+    *lval = ctx->ptr;
     ctx->ptr = p1;
     return 0;
 }
@@ -145,14 +146,14 @@
     return -1;
 }
 
-static int check_keywords(parser_ctx_t *ctx)
+static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval)
 {
     int min = 0, max = sizeof(keywords)/sizeof(keywords[0])-1, r, i;
 
     while(min <= max) {
         i = (min+max)/2;
 
-        r = check_keyword(ctx, keywords[i].word);
+        r = check_keyword(ctx, keywords[i].word, lval);
         if(!r)
             return keywords[i].token;
 
@@ -468,7 +469,7 @@
     }while(skip_comment(ctx));
 
     if(isalphaW(*ctx->ptr)) {
-        ret = check_keywords(ctx);
+        ret = check_keywords(ctx, lval);
         if(ret)
             return ret;
 
@@ -480,7 +481,6 @@
 
     switch(*ctx->ptr) {
     case '{':
-    case '}':
     case '(':
     case ')':
     case '[':
@@ -492,6 +492,10 @@
     case ':':
         return *ctx->ptr++;
 
+    case '}':
+        *(const WCHAR**)lval = ctx->ptr++;
+        return '}';
+
     case '.':
         if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr))
             return parse_double_literal(ctx, 0, lval);