From patchwork Mon May 24 07:39:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 53409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5EE6EB7D2E for ; Mon, 24 May 2010 19:39:39 +1000 (EST) Received: from localhost ([127.0.0.1]:39085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGU8G-00014E-Hv for incoming@patchwork.ozlabs.org; Mon, 24 May 2010 05:39:36 -0400 Received: from [140.186.70.92] (port=58001 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGU7N-000127-I7 for qemu-devel@nongnu.org; Mon, 24 May 2010 05:38:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGSGl-0005r8-9X for qemu-devel@nongnu.org; Mon, 24 May 2010 03:40:23 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:55609) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGSGc-0005no-Um for qemu-devel@nongnu.org; Mon, 24 May 2010 03:40:11 -0400 Received: by wyb39 with SMTP id 39so451154wyb.4 for ; Mon, 24 May 2010 00:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=EIB1YkjqaJqZ2dHpuRl/uQfhKKoUVenICjKyGhkWdZY=; b=lhT3bGW9dhDeZDkJxzgjaQj8X4e6FMh3CkX64fOMZHqwRzSw85BuHoHwsmo5jqaYN2 Pr+AN4/m+jPpA9Ox5UufTjnZTgqsCOHEiDxJ7oW09SJ17Ds7Qkh59dNGgcYeIetanm1z Rlok6PR+4McddJ7xm4G07NFLjWmY03NVpZaLg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=o8QH+htHV/R7zScp0HlhMM3lvL0KeYAAMvTOaTup/1WfF4tnJJGvFbYjfG7JZvoCfj sCqjsdNN/pHz7gqLVqxn7kgq4zWbbUTeGOnk6zJ3MQvOvyR0cGmxRCZ0YDKXdEFXkLvR rZ3tT5XsmF2udd9g6PSzfpDo/ewK8Kdzx+HFk= Received: by 10.216.89.20 with SMTP id b20mr3129907wef.58.1274686805442; Mon, 24 May 2010 00:40:05 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id 16sm1810225ewy.7.2010.05.24.00.40.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 May 2010 00:40:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 24 May 2010 09:39:53 +0200 Message-Id: <1274686793-1566-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1274686793-1566-1-git-send-email-pbonzini@redhat.com> References: <1274686793-1566-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 3/3] remove unnecessary lookaheads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- json-lexer.c | 48 ++++++++++++++++-------------------------------- 1 files changed, 16 insertions(+), 32 deletions(-) diff --git a/json-lexer.c b/json-lexer.c index 41b37f4..ec96fb4 100644 --- a/json-lexer.c +++ b/json-lexer.c @@ -29,7 +29,6 @@ enum json_lexer_state { ERROR = 0, - IN_DONE_STRING, IN_DQ_UCODE3, IN_DQ_UCODE2, IN_DQ_UCODE1, @@ -57,9 +56,7 @@ enum json_lexer_state { IN_ESCAPE_I, IN_ESCAPE_I6, IN_ESCAPE_I64, - IN_ESCAPE_DONE, IN_WHITESPACE, - IN_OPERATOR_DONE, IN_START, }; @@ -72,10 +69,6 @@ enum json_lexer_state { (json_lexer[(old_state)][0] == (terminal)) static const uint8_t json_lexer[][256] = { - [IN_DONE_STRING] = { - TERMINAL(JSON_STRING), - }, - /* double quote string */ [IN_DQ_UCODE3] = { ['0' ... '9'] = IN_DQ_STRING, @@ -110,7 +103,7 @@ static const uint8_t json_lexer[][256] = { [IN_DQ_STRING] = { [1 ... 0xFF] = IN_DQ_STRING, ['\\'] = IN_DQ_STRING_ESCAPE, - ['"'] = IN_DONE_STRING, + ['"'] = JSON_STRING, }, /* single quote string */ @@ -147,7 +140,7 @@ static const uint8_t json_lexer[][256] = { [IN_SQ_STRING] = { [1 ... 0xFF] = IN_SQ_STRING, ['\\'] = IN_SQ_STRING_ESCAPE, - ['\''] = IN_DONE_STRING, + ['\''] = JSON_STRING, }, /* Zero */ @@ -213,27 +206,18 @@ static const uint8_t json_lexer[][256] = { ['\n'] = IN_WHITESPACE, }, - /* operator */ - [IN_OPERATOR_DONE] = { - TERMINAL(JSON_OPERATOR), - }, - /* escape */ - [IN_ESCAPE_DONE] = { - TERMINAL(JSON_ESCAPE), - }, - [IN_ESCAPE_LL] = { - ['d'] = IN_ESCAPE_DONE, + ['d'] = JSON_ESCAPE, }, [IN_ESCAPE_L] = { - ['d'] = IN_ESCAPE_DONE, + ['d'] = JSON_ESCAPE, ['l'] = IN_ESCAPE_LL, }, [IN_ESCAPE_I64] = { - ['d'] = IN_ESCAPE_DONE, + ['d'] = JSON_ESCAPE, }, [IN_ESCAPE_I6] = { @@ -245,11 +229,11 @@ static const uint8_t json_lexer[][256] = { }, [IN_ESCAPE] = { - ['d'] = IN_ESCAPE_DONE, - ['i'] = IN_ESCAPE_DONE, - ['p'] = IN_ESCAPE_DONE, - ['s'] = IN_ESCAPE_DONE, - ['f'] = IN_ESCAPE_DONE, + ['d'] = JSON_ESCAPE, + ['i'] = JSON_ESCAPE, + ['p'] = JSON_ESCAPE, + ['s'] = JSON_ESCAPE, + ['f'] = JSON_ESCAPE, ['l'] = IN_ESCAPE_L, ['I'] = IN_ESCAPE_I, }, @@ -261,12 +245,12 @@ static const uint8_t json_lexer[][256] = { ['0'] = IN_ZERO, ['1' ... '9'] = IN_NONZERO_NUMBER, ['-'] = IN_NEG_NONZERO_NUMBER, - ['{'] = IN_OPERATOR_DONE, - ['}'] = IN_OPERATOR_DONE, - ['['] = IN_OPERATOR_DONE, - [']'] = IN_OPERATOR_DONE, - [','] = IN_OPERATOR_DONE, - [':'] = IN_OPERATOR_DONE, + ['{'] = JSON_OPERATOR, + ['}'] = JSON_OPERATOR, + ['['] = JSON_OPERATOR, + [']'] = JSON_OPERATOR, + [','] = JSON_OPERATOR, + [':'] = JSON_OPERATOR, ['a' ... 'z'] = IN_KEYWORD, ['%'] = IN_ESCAPE, [' '] = IN_WHITESPACE,