From e848bfaf43d0578552f38cf1637d3c5364a8bba1 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 24 Feb 2015 22:56:44 +0700 Subject: [PATCH 1/1] grammar: remove `line_annotations_forclass` and `superclass` from classdef They will be reintroduced as propdefs in next commits Signed-off-by: Jean Privat --- src/parser/nit.sablecc3xx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index e0b3b0d..7c74a99 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -233,7 +233,7 @@ implicit_main_meth {-> propdef} /* CLASSES *******************************************************************/ classdef - = [doc]:no redef visibility classkind no qclassid formaldefs line_annotations_forclass? extern_code_block? [superclasses]:superclass* propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], line_annotations_forclass.annotations, extern_code_block, [superclasses.superclass], [propdefs.propdef], kwend)}; + = [doc]:no redef visibility classkind no qclassid formaldefs extern_code_block? propdefs kwend {-> New classdef.std(doc.doc, redef.kwredef, visibility, classkind, qclassid.classid, [formaldefs.formaldef], extern_code_block, [propdefs.propdef], kwend)}; redef {-> kwredef?} = kwredef? {-> kwredef}; classkind @@ -799,7 +799,7 @@ visibility | {intrude} kwintrude ; -classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* annotations? extern_code_block? [superclasses]:superclass* [propdefs]:propdef* kwend +classdef= {std} doc? kwredef? visibility classkind [id]:classid? [formaldefs]:formaldef* extern_code_block? [propdefs]:propdef* kwend | {top} [propdefs]:propdef* | {main} [propdefs]:propdef* ; -- 1.7.9.5