From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.4253.1591331925199089648 for ; Thu, 04 Jun 2020 21:38:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=dTl128+P; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yuwei.chen@intel.com) IronPort-SDR: NPWNlgPbwCvdcyDkQWcuNuPDTXf9O/7uY1vOfqilUduXsVStvqSoJ77xgWWkpjnovis9ulbSOx pqO5Rrxd1AFg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2020 21:38:43 -0700 IronPort-SDR: e9U7TsliFAv1tKf9jjCMTZ7dDi8vAL9jhMMUHFSNb0cqavi7MiDOlTPiO7ESOHvaPvw5kegNgT I+ucfVJ15wDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,475,1583222400"; d="scan'208";a="273349214" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga006.jf.intel.com with ESMTP; 04 Jun 2020 21:38:43 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 4 Jun 2020 21:38:43 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 4 Jun 2020 21:38:42 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 4 Jun 2020 21:38:42 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 4 Jun 2020 21:38:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f11ssL/M3A8zKbbBkPNSCv3qFuG9GfQy2o5U0o6rNrGJvfwlrxWJq6fqUNIG/sGsY3G1rbb5Upb7F0aUVrWk9hDBptMX3Fk75fu/O5SSKNMl4tg3ymmwYEUCgnCIIBUXSDjAkHE1vPZ8Pau5CteBXDjW++UqGwFwv4uBoue7pdJuHFLfuZGj6bEzus8EfYK1zPPK8yvoilwVhYCQwDMfSbgPi06AGO5Iwk4yqyhe3UIuBKuRr5q7MdtlXq6sygM/YuupyYoFdxTDlKpbxSE/eZ3cPMnoLsmDmwxfDApSAlicEWnFVhsDodoYDboZBqRtXBgs7GM+q6WuNIR0e350rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Bho18PVkFtUCdbOvJ6bLBnLYJQDVrBaFLG5DSV2tBs=; b=fQTvGobXxYDuehrJLfm1MpnHh8n+JSMBJHIPeHsFbNXSLYbTTQRLDX2Br9sRhzkjqNt18gNawfLqo4CaIZECt43UmLZrrACDCRuqwZ6IWcvRpL7eKMjF5HCe3FzMEaOlYtMXvcFRUqQdzzl+W+ZglluTa17dbMknxznjxoySiWWe9tZDG7Lxe28Uz6KPBUH95/M2qmyxf0UReHqWRMHs7QDYu76ZsewC+xTkp88kSAVzTxtAtk64wu5QbHpUS9HVb7OzGyC4S8bYi3zKdbACIl+7uyXBggYYs93g98vw7P1/oYZx3IJqP6RdaAPyGPVRF2m13YucHWlWFyTxXMoDPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Bho18PVkFtUCdbOvJ6bLBnLYJQDVrBaFLG5DSV2tBs=; b=dTl128+PDsTTzlkA0+4PG+HJzQyvte1qVnm3EIlhOyiszP0jdCK5wEkd/ybFoIMgRotn2/C2Vgw4KZ/VP1uuf7m+5n/V2MYMjtNseozQ+vZykbGWvkK6hV+QB0IjX0k5oPT519QrCcuIZ0D/DdqcGKsaJ0vXPLvMc5PGd4qp1pg= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM5PR11MB1498.namprd11.prod.outlook.com (2603:10b6:4:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.20; Fri, 5 Jun 2020 04:38:39 +0000 Received: from DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::25cf:8c3:b35e:35dc]) by DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::25cf:8c3:b35e:35dc%11]) with mapi id 15.20.3045.024; Fri, 5 Jun 2020 04:38:39 +0000 From: "Yuwei Chen" To: "devel@edk2.groups.io" , "Zhang, Shenglei" CC: "Fan, ZhijuX" , "Feng, Bob C" , "Gao, Liming" Subject: Re: [edk2-devel] [PATCH v2 1/5] BaseTools:ECC needs to update the contents of CParser4 Thread-Topic: [edk2-devel] [PATCH v2 1/5] BaseTools:ECC needs to update the contents of CParser4 Thread-Index: AQHWOYPHBPyrtZvpOE2Ger8p5fqNtajJaROA Date: Fri, 5 Jun 2020 04:38:39 +0000 Message-ID: References: <20200603084807.24484-1-shenglei.zhang@intel.com> <20200603084807.24484-2-shenglei.zhang@intel.com> In-Reply-To: <20200603084807.24484-2-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ba773c8a-f088-4cc9-4c12-08d8090a5191 x-ms-traffictypediagnostic: DM5PR11MB1498: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-forefront-prvs: 0425A67DEF x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 92wL8lPbDpDEG7gYg/ev9TFBDQ1zy+qrruYZa2hndoKdiBmjSbc4/1YMP7hSKgdIhu/YBv+1ZMEmCcTqWr/UKS+9x94vp1gVBV/SuStY2Oju5OgssvdcKKWVPz9q6gJZoB+mGpcc1xucwj7sCmxEXi4BHD/fdU6g0g72qZUkt0zWGCtRvwwwrop497Y045N2ZafOsgrD40NySz+u8iapEo0xOF6FI8b/BXkxpC0TWOTcp6l5FZqoMBPxy3cpcKVp0FuEmgSVwf2xkarj9w0V7KhwYGdo8b3D3cLFWkngMXjnXi4X4OFcbCOdQdOkjIbK0y8CrN1/Ax8L73t4flFRChZrzh+5zQKZg7QBYGiQXFqToZSag6RVG/Pjv3r+mWgYuX7KiYEbAIofea36J1q5CA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1594.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(346002)(376002)(136003)(396003)(366004)(39860400002)(86362001)(71200400001)(76116006)(186003)(30864003)(107886003)(5660300002)(4326008)(8936002)(8676002)(33656002)(6636002)(66446008)(478600001)(19627235002)(15650500001)(64756008)(52536014)(66476007)(66556008)(83380400001)(55016002)(9686003)(7696005)(26005)(53546011)(6506007)(54906003)(2906002)(66946007)(316002)(966005)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 8CRYPHbc/EX5lDRl03TSvHlPHRclUiy6TTO47PpXEnhgMLKbVv7hYFAyEx0meUHu5mWEImonlzsa88KJfA3bNPEpqms/Nnyf5x8W4vYPdvS0KTFHz9X6MMYC4hn/F7mQbeTAp+SWID1NtEBBVddSSPp8Siw/VGBC3HVoA8uZHGVlu+lX+cAEluAlf3n1TtKZGUJ68F7+ECY3JLSLvQQoew2QjsHQQYAJgVa/Q7n6B5Cepo5KF29qysVqWn1QpBroK2NUenkNVm8hUy/YmHT2S+uOroT28d4IsPKiJu6gtbWUgy2p9Uc1+WDQVQseYQyATwQHm/i6P+cJNMVejAvKb9y25iky+dtOwl14y6hxturQE0WSs8nvNpB4+pQ9QsNE8f22GNi2exwZEsFYze3Oo/w+LNvZpupa0GgykziSO+dGShAoy37l9i86Nu06X5nm28GsudhKQHxR0YyuArE2ETn/7zSHxmWcg0FYn2/HgcU= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: ba773c8a-f088-4cc9-4c12-08d8090a5191 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jun 2020 04:38:39.4295 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ui4EL4W8kqM2L4Cz5pcAI3bMJzLghaxQI4/XyuXzoS1SU4rwFD3Kfv3zg2dUGF5g0NQQKuAErTfg+Nh8ORXLzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1498 Return-Path: yuwei.chen@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Shenglei Since the input arguments number of the getText() function changed, the bu= ild failed. May be you should check about the getText() function's input. While how to choose the CParser4 and CParser3, I am not familiar with it, = would you like to explain for me? Thanks, Yuwei > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Zhang, > Shenglei > Sent: Wednesday, June 3, 2020 4:48 PM > To: devel@edk2.groups.io > Cc: Fan, ZhijuX ; Feng, Bob C > ; Gao, Liming > Subject: [edk2-devel] [PATCH v2 1/5] BaseTools:ECC needs to update the > contents of CParser4 >=20 > From: "Fan, Zhiju" >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2676 >=20 > Because Ecc relies on the antlr extension package, When the antlr versio= n is > updated, we need to change the code in it. > Currently, if you use the latest version antlr4.8, Ecc will fail >=20 > We will update the version to support the use of antlr4.8 and all previo= us > versions will have errors.This can be resolved by installing the antlr4.= 8 version. > Installation method: pip install antlr4-python3-runtime=3D=3D4.8 >=20 > This patch is going to fixed this issue >=20 > Cc: Bob Feng > Cc: Liming Gao > Signed-off-by: Zhiju.Fan > --- > .../Source/Python/Ecc/CParser4/CLexer.py | 6 +-- > .../Source/Python/Ecc/CParser4/CListener.py | 4 +- > .../Source/Python/Ecc/CParser4/CParser.py | 38 ++++++++++--------- > 3 files changed, 25 insertions(+), 23 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Ecc/CParser4/CLexer.py > b/BaseTools/Source/Python/Ecc/CParser4/CLexer.py > index a2cc5bf56e66..40e2afbf1a1f 100644 > --- a/BaseTools/Source/Python/Ecc/CParser4/CLexer.py > +++ b/BaseTools/Source/Python/Ecc/CParser4/CLexer.py > @@ -1,4 +1,4 @@ > -# Generated from C.g4 by ANTLR 4.7.1 > +# Generated from C.g4 by ANTLR 4.8 > from antlr4 import * > from io import StringIO > from typing.io import TextIO > @@ -12,7 +12,7 @@ import sys > # This file is generated by running: > # java org.antlr.Tool C.g > # > -# Copyright (c) 2009 - 2010, Intel Corporation All rights reserved. > +# Copyright (c) 2009 - 2020, Intel Corporation All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -584,7 +584,7 @@ > class CLexer(Lexer): > # @param output=3D sys.stdout Type: TextIO > def __init__(self,input=3DNone,output=3D sys.stdout): > super().__init__(input, output) > - self.checkVersion("4.7.1") > + self.checkVersion("4.8") > self._interp =3D LexerATNSimulator(self, self.atn, self.decisio= nsToDFA, > PredictionContextCache()) > self._actions =3D None > self._predicates =3D None > diff --git a/BaseTools/Source/Python/Ecc/CParser4/CListener.py > b/BaseTools/Source/Python/Ecc/CParser4/CListener.py > index bb4351d9249a..ba7e70892680 100644 > --- a/BaseTools/Source/Python/Ecc/CParser4/CListener.py > +++ b/BaseTools/Source/Python/Ecc/CParser4/CListener.py > @@ -1,4 +1,4 @@ > -# Generated from C.g4 by ANTLR 4.7.1 > +# Generated from C.g4 by ANTLR 4.8 > from antlr4 import * > if __name__ is not None and "." in __name__: > from .CParser import CParser > @@ -12,7 +12,7 @@ else: > # This file is generated by running: > # java org.antlr.Tool C.g > # > -# Copyright (c) 2009 - 2010, Intel Corporation All rights reserved. > +# Copyright (c) 2009 - 2020, Intel Corporation All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent # diff --git > a/BaseTools/Source/Python/Ecc/CParser4/CParser.py > b/BaseTools/Source/Python/Ecc/CParser4/CParser.py > index 31d23d55aa57..30d70a74e669 100644 > --- a/BaseTools/Source/Python/Ecc/CParser4/CParser.py > +++ b/BaseTools/Source/Python/Ecc/CParser4/CParser.py > @@ -1,10 +1,12 @@ > -# Generated from C.g4 by ANTLR 4.7.1 > +# Generated from C.g4 by ANTLR 4.8 > # encoding: utf-8 > from antlr4 import * > from io import StringIO > -from typing.io import TextIO > import sys > - > +if sys.version_info[1] > 5: > + from typing import TextIO > +else: > + from typing.io import TextIO >=20 > ## @file > # The file defines the parser for C source files. > @@ -13,7 +15,7 @@ import sys > # This file is generated by running: > # java org.antlr.Tool C.g > # > -# Copyright (c) 2009 - 2010, Intel Corporation All rights reserved. > +# Copyright (c) 2009 - 2020, Intel Corporation All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -739,7 +741,7 @@ > class CParser ( Parser ): > # @param output=3D sys.stdout Type: TextIO > def __init__(self,input,output=3D sys.stdout): > super().__init__(input, output) > - self.checkVersion("4.7.1") > + self.checkVersion("4.8") > self._interp =3D ParserATNSimulator(self, self.atn, self.decisi= onsToDFA, > self.sharedContextCache) > self._predicates =3D None >=20 > @@ -1062,10 +1064,10 @@ class CParser ( Parser ): >=20 >=20 > if localctx.d !=3D None: > - ModifierText =3D (None if localctx._declaration_specifi= ers is None else > self._input.getText((localctx._declaration_specifiers.start,localctx._de= clarati > on_specifiers.stop))) > + ModifierText =3D (None if > + localctx._declaration_specifiers is None else > + self._input.getText(localctx._declaration_specifiers.start,localctx._d > + eclaration_specifiers.stop)) > else: > ModifierText =3D '' > - DeclText =3D (None if localctx._declarator is None else > self._input.getText((localctx._declarator.start,localctx._declarator.sto= p))) > + DeclText =3D (None if localctx._declarator is None else > + self._input.getText(localctx._declarator.start,localctx._declarator.st > + op)) > DeclLine =3D (None if localctx._declarator is None else > localctx._declarator.start).line > DeclOffset =3D (None if localctx._declarator is None else > localctx._declarator.start).column > if localctx.a !=3D None: > @@ -1245,9 +1247,9 @@ class CParser ( Parser ): > localctx.d =3D self.match(CParser.T__1) >=20 > if localctx.b is not None: > - self.StoreTypedefDefinition(localctx.a.line, localc= tx.a.column, (0 if > localctx.d is None else localctx.d.line), localctx.d.column, (None if lo= calctx.b is > None else self._input.getText((localctx.b.start,localctx.b.stop))), (Non= e if > localctx.c is None else self._input.getText((localctx.c.start,localctx.c= .stop)))) > + self.StoreTypedefDefinition(localctx.a.line, > + localctx.a.column, (0 if localctx.d is None else localctx.d.line), > + localctx.d.column, (None if localctx.b is None else > + self._input.getText(localctx.b.start,localctx.b.stop)), (None if > + localctx.c is None else > + self._input.getText(localctx.c.start,localctx.c.stop))) > else: > - self.StoreTypedefDefinition(localctx.a.line, localc= tx.a.column, (0 if > localctx.d is None else localctx.d.line), localctx.d.column, '', (None i= f localctx.c > is None else self._input.getText((localctx.c.start,localctx.c.stop)))) > + self.StoreTypedefDefinition(localctx.a.line, > + localctx.a.column, (0 if localctx.d is None else localctx.d.line), > + localctx.d.column, '', (None if localctx.c is None else > + self._input.getText(localctx.c.start,localctx.c.stop))) >=20 > pass > elif token in [CParser.T__5, CParser.T__6, CParser.T__7, CP= arser.T__8, > CParser.T__9, CParser.T__10, CParser.T__11, CParser.T__12, CParser.T__13= , > CParser.T__14, CParser.T__15, CParser.T__16, CParser.T__17, CParser.T__1= 8, > CParser.T__20, CParser.T__21, CParser.T__23, CParser.T__24, CParser.T__2= 5, > CParser.T__26, CParser.T__27, CParser.T__28, CParser.T__29, CParser.T__3= 0, > CParser.T__31, CParser.T__32, CParser.T__33, CParser.T__34, CParser.T__3= 5, > CParser.T__36, CParser.IDENTIFIER]: > @@ -1266,7 +1268,7 @@ class CParser ( Parser ): > localctx.e =3D self.match(CParser.T__1) >=20 > if localctx.t is not None: > - self.StoreVariableDeclaration((None if localctx.s i= s None else > localctx.s.start).line, (None if localctx.s is None else localctx.s.star= t).column, > (None if localctx.t is None else localctx.t.start).line, (None if localc= tx.t is None > else localctx.t.start).column, (None if localctx.s is None else > self._input.getText((localctx.s.start,localctx.s.stop))), (None if local= ctx.t is > None else self._input.getText((localctx.t.start,localctx.t.stop)))) > + self.StoreVariableDeclaration((None if localctx.s > + is None else localctx.s.start).line, (None if localctx.s is None else > + localctx.s.start).column, (None if localctx.t is None else > + localctx.t.start).line, (None if localctx.t is None else > + localctx.t.start).column, (None if localctx.s is None else > + self._input.getText(localctx.s.start,localctx.s.stop)), (None if > + localctx.t is None else > + self._input.getText(localctx.t.start,localctx.t.stop))) >=20 > pass > else: > @@ -1568,7 +1570,7 @@ class CParser ( Parser ): > localctx.s =3D self.struct_or_union_specifier() >=20 > if localctx.s.stop is not None: > - self.StoreStructUnionDefinition((None if localctx.s= is None else > localctx.s.start).line, (None if localctx.s is None else localctx.s.star= t).column, > (None if localctx.s is None else localctx.s.stop).line, (None if localct= x.s is None > else localctx.s.stop).column, (None if localctx.s is None else > self._input.getText((localctx.s.start,localctx.s.stop)))) > + self.StoreStructUnionDefinition((None if localctx.s > + is None else localctx.s.start).line, (None if localctx.s is None else > + localctx.s.start).column, (None if localctx.s is None else > + localctx.s.stop).line, (None if localctx.s is None else > + localctx.s.stop).column, (None if localctx.s is None else > + self._input.getText(localctx.s.start,localctx.s.stop))) >=20 > pass >=20 > @@ -1578,7 +1580,7 @@ class CParser ( Parser ): > localctx.e =3D self.enum_specifier() >=20 > if localctx.e.stop is not None: > - self.StoreEnumerationDefinition((None if localctx.e= is None else > localctx.e.start).line, (None if localctx.e is None else localctx.e.star= t).column, > (None if localctx.e is None else localctx.e.stop).line, (None if localct= x.e is > None else localctx.e.stop).column, (None if localctx.e is None else > self._input.getText((localctx.e.start,localctx.e.stop)))) > + self.StoreEnumerationDefinition((None if localctx.e > + is None else localctx.e.start).line, (None if localctx.e is None else > + localctx.e.start).column, (None if localctx.e is None else > + localctx.e.stop).line, (None if localctx.e is None else > + localctx.e.stop).column, (None if localctx.e is None else > + self._input.getText(localctx.e.start,localctx.e.stop))) >=20 > pass >=20 > @@ -4022,7 +4024,7 @@ class CParser ( Parser ): > self.enterOuterAlt(localctx, 1) > self.state =3D 569 > localctx.p =3D self.primary_expression() > - self.FuncCallText +=3D (None if localctx.p is None else > self._input.getText((localctx.p.start,localctx.p.stop))) > + self.FuncCallText +=3D (None if localctx.p is None else > + self._input.getText(localctx.p.start,localctx.p.stop)) > self.state =3D 600 > self._errHandler.sync(self) > _alt =3D self._interp.adaptivePredict(self._input,73,self._= ctx) > @@ -4055,7 +4057,7 @@ class CParser ( Parser ): > localctx.c =3D self.argument_expression_list() > self.state =3D 580 > localctx.b =3D self.match(CParser.T__38) > - self.StoreFunctionCalling((None if localctx.p i= s None else > localctx.p.start).line, (None if localctx.p is None else localctx.p.star= t).column, > (0 if localctx.b is None else localctx.b.line), localctx.b.column, > self.FuncCallText, (None if localctx.c is None else > self._input.getText((localctx.c.start,localctx.c.stop)))) > + self.StoreFunctionCalling((None if localctx.p > + is None else localctx.p.start).line, (None if localctx.p is None else > + localctx.p.start).column, (0 if localctx.b is None else > + localctx.b.line), localctx.b.column, self.FuncCallText, (None if > + localctx.c is None else > + self._input.getText(localctx.c.start,localctx.c.stop))) > pass >=20 > elif la_ =3D=3D 4: > @@ -4770,7 +4772,7 @@ class CParser ( Parser ): > self.match(CParser.T__22) > self.state =3D 674 > self.conditional_expression() > - self.StorePredicateExpression((None if localctx.e is No= ne else > localctx.e.start).line, (None if localctx.e is None else localctx.e.star= t).column, > (None if localctx.e is None else localctx.e.stop).line, (None if localct= x.e is > None else localctx.e.stop).column, (None if localctx.e is None else > self._input.getText((localctx.e.start,localctx.e.stop)))) > + self.StorePredicateExpression((None if localctx.e is > + None else localctx.e.start).line, (None if localctx.e is None else > + localctx.e.start).column, (None if localctx.e is None else > + localctx.e.stop).line, (None if localctx.e is None else > + localctx.e.stop).column, (None if localctx.e is None else > + self._input.getText(localctx.e.start,localctx.e.stop))) >=20 >=20 > except RecognitionException as re: > @@ -6053,7 +6055,7 @@ class CParser ( Parser ): > localctx.e =3D self.expression() > self.state =3D 845 > self.match(CParser.T__38) > - self.StorePredicateExpression((None if localctx.e is No= ne else > localctx.e.start).line, (None if localctx.e is None else localctx.e.star= t).column, > (None if localctx.e is None else localctx.e.stop).line, (None if localct= x.e is > None else localctx.e.stop).column, (None if localctx.e is None else > self._input.getText((localctx.e.start,localctx.e.stop)))) > + self.StorePredicateExpression((None if localctx.e is > + None else localctx.e.start).line, (None if localctx.e is None else > + localctx.e.start).column, (None if localctx.e is None else > + localctx.e.stop).line, (None if localctx.e is None else > + localctx.e.stop).column, (None if localctx.e is None else > + self._input.getText(localctx.e.start,localctx.e.stop))) > self.state =3D 847 > self.statement() > self.state =3D 850 > @@ -6144,7 +6146,7 @@ class CParser ( Parser ): > self.match(CParser.T__38) > self.state =3D 864 > self.statement() > - self.StorePredicateExpression((None if localctx.e is No= ne else > localctx.e.start).line, (None if localctx.e is None else localctx.e.star= t).column, > (None if localctx.e is None else localctx.e.stop).line, (None if localct= x.e is > None else localctx.e.stop).column, (None if localctx.e is None else > self._input.getText((localctx.e.start,localctx.e.stop)))) > + self.StorePredicateExpression((None if localctx.e is > + None else localctx.e.start).line, (None if localctx.e is None else > + localctx.e.start).column, (None if localctx.e is None else > + localctx.e.stop).line, (None if localctx.e is None else > + localctx.e.stop).column, (None if localctx.e is None else > + self._input.getText(localctx.e.start,localctx.e.stop))) > pass > elif token in [CParser.T__87]: > self.enterOuterAlt(localctx, 2) @@ -6162,7 +6164,7 @@ c= lass CParser > ( Parser ): > self.match(CParser.T__38) > self.state =3D 873 > self.match(CParser.T__1) > - self.StorePredicateExpression((None if localctx.e is No= ne else > localctx.e.start).line, (None if localctx.e is None else localctx.e.star= t).column, > (None if localctx.e is None else localctx.e.stop).line, (None if localct= x.e is > None else localctx.e.stop).column, (None if localctx.e is None else > self._input.getText((localctx.e.start,localctx.e.stop)))) > + self.StorePredicateExpression((None if localctx.e is > + None else localctx.e.start).line, (None if localctx.e is None else > + localctx.e.start).column, (None if localctx.e is None else > + localctx.e.stop).line, (None if localctx.e is None else > + localctx.e.stop).column, (None if localctx.e is None else > + self._input.getText(localctx.e.start,localctx.e.stop))) > pass > else: > raise NoViableAltException(self) > -- > 2.18.0.windows.1 >=20 >=20 >=20