From patchwork Mon May 7 18:53:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 157381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id F23CDB6FA9 for ; Tue, 8 May 2012 04:54:12 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1337021653; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=OCFHYBrJCfMK/D/PlGj9crBpu0k=; b=rDrcFBER+QaO7wj 1F3o4XSpbNKA7XzBCwStDhXafR60B4e6gd/1ia6kCqOzH1HZKvYfw6zwBiLuyTQC ycOdgQle3lCdD08RGqVaxJjvnQESUte9myqhBcZu0FJkeul9zxMjzn1SuEDSttMP k8qNniFS89jOw2d20Xjm/RuJWo78= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=BEog5VAidA8J8K1++GPK00FwegyycaLPGUVaxK+qg0PokakTtToWYBfYN9f5jH 5hzu0T1j1zIcV5C2TKyLJ9jY+MFjvkGKf9iispPLP3thpOnf8Jck6wfzQsqo7tpp GcmDSlsQg9Bmgzzdffsl4C3y732z7ICAn+vbNVYTy4Xhg=; Received: (qmail 1778 invoked by alias); 7 May 2012 18:54:07 -0000 Received: (qmail 1769 invoked by uid 22791); 7 May 2012 18:54:05 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-pz0-f48.google.com (HELO mail-pz0-f48.google.com) (209.85.210.48) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 May 2012 18:53:52 +0000 Received: by dadz8 with SMTP id z8so3502801dad.21 for ; Mon, 07 May 2012 11:53:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=iQB+shzyggKrPwmbpGNnjD9lKglWWLeIBfj00BtQ+KA=; b=jsXyxmFAdWD1ZBdYLdAUgEP4o63lU758CIKFb4ccgrebPl9+Q2xqwgQURzXV6IP4iA mFI1Kg6jkxlOMhp104q2bu+ds2qTN1cwKe18Q+JRdQfNY08vcPwEi4rPD48HuSN0aAGv /JJ7+qsTRsnRvizAJ6SwoQQJpKigutcehUC/E6H5voZJZJYjnHAs7K8vQrkOLBIdN79e Sbx06+3OnVLvKLWKZFs5AUGTCq06hnsUN7r4i/a3i0EhdnuS08JUbzPLhTukqEYCo+dy G+II98ziW0qJ0Uw7AR3iLal5V5w2KKF9g7KDGTBW0PTfn5mXnKzyNPle0hSCTk9d8E1V djLw== Received: by 10.68.232.233 with SMTP id tr9mr29452160pbc.153.1336416831447; Mon, 07 May 2012 11:53:51 -0700 (PDT) Received: by 10.68.232.233 with SMTP id tr9mr29452002pbc.153.1336416830475; Mon, 07 May 2012 11:53:50 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id pj7sm17940797pbb.17.2012.05.07.11.53.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 11:53:49 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Go patch committed: Don't treat 0x123i as 123i Date: Mon, 07 May 2012 11:53:46 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQluclAEDRuEqIQpIDKvVSrW7B069PuU/rgaaupVFvJ7MEK6g/Wpjz6MnkGk4HYQYAg8qgcqy9wY1jCqZCuXRVmI7UYftev40zza+toYd/+GmPZBGf/1pz0VaJgukMgQ6BeAUt6xWsQUHeJwkTGKJKjy6yPGMa7CKQPW2IKWnlk4UNHn/BE= X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch from Rémy Oudompheng fixes the Go frontend lexer to not treat 0x123i as 123i. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline and 4.7 branch. Ian diff -r 8671bcd0c298 go/lex.cc --- a/go/lex.cc Mon May 07 11:35:33 2012 -0700 +++ b/go/lex.cc Mon May 07 11:50:46 2012 -0700 @@ -1012,7 +1012,9 @@ } } - if (*p != '.' && *p != 'i' && !Lex::could_be_exponent(p, pend)) + // A partial token that looks like an octal literal might actually be the + // beginning of a floating-point or imaginary literal. + if (base == 16 || (*p != '.' && *p != 'i' && !Lex::could_be_exponent(p, pend))) { std::string s(pnum, p - pnum); mpz_t val;