From 1016c502bfda59af9695ec93e84b279b1d6ab245 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 20 Jan 2011 14:44:49 -0500 Subject: [PATCH] parser: rename package-related classes and properties TKwpackage -> TKwmodule APackagedecl -> AModuledecl n_packagedecl -> n_moduledecl n_kwpackage -> n_kwmodule Signed-off-by: Jean Privat --- src/nitdoc.nit | 4 +- src/parser/lexer.nit | 4 +- src/parser/nit.sablecc3xx | 14 +++--- src/parser/parser.nit | 106 +++++++++++++++++++++---------------------- src/parser/parser_abs.nit | 12 ++--- src/parser/parser_nodes.nit | 8 ++-- src/parser/parser_prod.nit | 38 ++++++++-------- src/syntax/mmbuilder.nit | 2 +- 8 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/nitdoc.nit b/src/nitdoc.nit index 806756b..3f8978a 100644 --- a/src/nitdoc.nit +++ b/src/nitdoc.nit @@ -661,10 +661,10 @@ redef class MMSrcModule redef fun doc do var n = node - if n.n_packagedecl == null then + if n.n_moduledecl == null then return null end - var np = n.n_packagedecl + var np = n.n_moduledecl var d = np.n_doc if d == null then return null diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit index 8b9480d..6afe72c 100644 --- a/src/parser/lexer.nit +++ b/src/parser/lexer.nit @@ -40,7 +40,7 @@ redef class TComment end end -redef class TKwpackage +redef class TKwmodule redef fun parser_index: Int do return 2 @@ -1361,7 +1361,7 @@ class Lexer if accept_token == 3 then var location = new Location(_filename, start_line + 1, accept_line + 1, start_pos + 1, accept_pos) var token_text = text.substring(0, accept_length) - var token = new TKwpackage.init_tk(token_text, location) + var token = new TKwmodule.init_tk(token_text, location) push_back(accept_length) _pos = accept_pos _line = accept_line diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx index 2d70390..492bce3 100644 --- a/src/parser/nit.sablecc3xx +++ b/src/parser/nit.sablecc3xx @@ -57,7 +57,7 @@ blank = (' ' | tab)+; eol = eol_helper; comment = '#' any* eol_helper; -kwpackage = 'package'|'module'; +kwmodule = 'package'|'module'; kwimport = 'import'; kwclass = 'class'; kwabstract = 'abstract'; @@ -159,10 +159,10 @@ Productions /* MODULES *******************************************************************/ module - = packagedecl? [imports]:import* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(packagedecl, [imports.import],[classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])}; + = moduledecl? [imports]:import* [classdefs]:classdef* implicit_top_class? implicit_main_class? {-> New module(moduledecl, [imports.import],[classdefs.classdef,implicit_top_class.classdef,implicit_main_class.classdef])}; -packagedecl - = [doc]:no kwpackage no id [n2]:n1 {-> New packagedecl(doc.doc, kwpackage, id)}; +moduledecl + = [doc]:no kwmodule no id [n2]:n1 {-> New moduledecl(doc.doc, kwmodule, id)}; import = {std} [doc]:no visibility kwimport no id [n2]:n1 {-> New import.std(visibility, kwimport, id)} @@ -570,10 +570,10 @@ n2 Abstract Syntax Tree /*****************************************************************************/ -module = packagedecl? [imports]:import* [classdefs]:classdef*; +module = moduledecl? [imports]:import* [classdefs]:classdef*; -packagedecl - = doc? kwpackage id; +moduledecl + = doc? kwmodule id; import = {std} visibility kwimport id | {no} visibility kwimport kwend diff --git a/src/parser/parser.nit b/src/parser/parser.nit index 0207247..23d9be7 100644 --- a/src/parser/parser.nit +++ b/src/parser/parser.nit @@ -958,10 +958,10 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode4 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode4 ) @@ -1002,13 +1002,13 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode5 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode5 ) @@ -1049,13 +1049,13 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode5 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode4 = nodearraylist2 assert listnode4 isa Array[Object] listnode5 = concat(listnode5, listnode4) var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode5 ) @@ -1101,8 +1101,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode6 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1110,7 +1110,7 @@ special ReduceAction assert listnode5 isa Array[Object] listnode6 = concat(listnode6, listnode5) var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode6 ) @@ -1158,8 +1158,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode7 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode6 = new Array[Object] var listnode5 = nodearraylist2 assert listnode5 isa Array[Object] @@ -1171,7 +1171,7 @@ special ReduceAction listnode7.add(pclassdefnode4) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode7 ) @@ -1224,8 +1224,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode8 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1240,7 +1240,7 @@ special ReduceAction listnode8.add(pclassdefnode5) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode8 ) @@ -1293,8 +1293,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode8 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode4 = nodearraylist2 assert listnode4 isa Array[Object] var listnode7 = new Array[Object] @@ -1309,7 +1309,7 @@ special ReduceAction listnode8.add(pclassdefnode5) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode8 ) @@ -1367,8 +1367,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode9 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1386,7 +1386,7 @@ special ReduceAction listnode9.add(pclassdefnode6) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode9 ) @@ -1429,15 +1429,15 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode5 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var pclassdefnode4 = nodearraylist2 assert pclassdefnode4 isa nullable AClassdef if pclassdefnode4 != null then listnode5.add(pclassdefnode4) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode5 ) @@ -1485,8 +1485,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode6 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1496,7 +1496,7 @@ special ReduceAction listnode6.add(pclassdefnode5) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode6 ) @@ -1544,8 +1544,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode6 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode4 = nodearraylist2 assert listnode4 isa Array[Object] var pclassdefnode5 = nodearraylist3 @@ -1555,7 +1555,7 @@ special ReduceAction listnode6.add(pclassdefnode5) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode6 ) @@ -1608,8 +1608,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode7 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1622,7 +1622,7 @@ special ReduceAction listnode7.add(pclassdefnode6) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode7 ) @@ -1677,8 +1677,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode8 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode6 = new Array[Object] var listnode5 = nodearraylist2 assert listnode5 isa Array[Object] @@ -1695,7 +1695,7 @@ special ReduceAction listnode8.add(pclassdefnode7) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode8 ) @@ -1755,8 +1755,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode9 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1776,7 +1776,7 @@ special ReduceAction listnode9.add(pclassdefnode8) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode9 ) @@ -1836,8 +1836,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode3 = new Array[Object] var listnode9 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode4 = nodearraylist2 assert listnode4 isa Array[Object] var listnode7 = new Array[Object] @@ -1857,7 +1857,7 @@ special ReduceAction listnode9.add(pclassdefnode8) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode3, listnode9 ) @@ -1922,8 +1922,8 @@ special ReduceAction var nodearraylist1 = p.pop var listnode4 = new Array[Object] var listnode10 = new Array[Object] - var ppackagedeclnode2 = nodearraylist1 - assert ppackagedeclnode2 isa nullable APackagedecl + var pmoduledeclnode2 = nodearraylist1 + assert pmoduledeclnode2 isa nullable AModuledecl var listnode3 = nodearraylist2 assert listnode3 isa Array[Object] listnode4 = concat(listnode4, listnode3) @@ -1946,7 +1946,7 @@ special ReduceAction listnode10.add(pclassdefnode9) end var pmodulenode1: nullable AModule = new AModule.init_amodule( - ppackagedeclnode2, + pmoduledeclnode2, listnode4, listnode10 ) @@ -1968,16 +1968,16 @@ special ReduceAction var nodearraylist1 = p.pop var pdocnode2 = nodearraylist1 assert pdocnode2 isa nullable ADoc - var tkwpackagenode3 = nodearraylist2 - assert tkwpackagenode3 isa nullable TKwpackage + var tkwmodulenode3 = nodearraylist2 + assert tkwmodulenode3 isa nullable TKwmodule var tidnode4 = nodearraylist4 assert tidnode4 isa nullable TId - var ppackagedeclnode1: nullable APackagedecl = new APackagedecl.init_apackagedecl( + var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl( pdocnode2, - tkwpackagenode3, + tkwmodulenode3, tidnode4 ) - node_list = ppackagedeclnode1 + node_list = pmoduledeclnode1 p.push(p.go_to(_goto), node_list) end var _goto: Int diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit index 1ad257c..e60ae76 100644 --- a/src/parser/parser_abs.nit +++ b/src/parser/parser_abs.nit @@ -29,7 +29,7 @@ end class TComment special Token end -class TKwpackage +class TKwmodule special Token end class TKwimport @@ -294,7 +294,7 @@ private init noinit do end end class AModule special Prod end -class APackagedecl special Prod end +class AModuledecl special Prod end class AImport special Prod end class AVisibility special Prod end class AClassdef special Prod end @@ -318,14 +318,14 @@ class ADoc special Prod end class AModule special AModule - readable var _n_packagedecl: nullable APackagedecl = null + readable var _n_moduledecl: nullable AModuledecl = null readable var _n_imports: List[AImport] = new List[AImport] readable var _n_classdefs: List[AClassdef] = new List[AClassdef] end -class APackagedecl -special APackagedecl +class AModuledecl +special AModuledecl readable var _n_doc: nullable ADoc = null - readable var _n_kwpackage: TKwpackage + readable var _n_kwmodule: TKwmodule readable var _n_id: TId end class AStdImport diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit index b0faf45..866d23b 100644 --- a/src/parser/parser_nodes.nit +++ b/src/parser/parser_nodes.nit @@ -45,7 +45,7 @@ end class TComment special Token end -class TKwpackage +class TKwmodule special Token end class TKwimport @@ -311,14 +311,14 @@ end class AModule special Prod - readable var _n_packagedecl: nullable APackagedecl = null + readable var _n_moduledecl: nullable AModuledecl = null readable var _n_imports: List[AImport] = new List[AImport] readable var _n_classdefs: List[AClassdef] = new List[AClassdef] end -class APackagedecl +class AModuledecl special Prod readable var _n_doc: nullable ADoc = null - readable var _n_kwpackage: TKwpackage + readable var _n_kwmodule: TKwmodule readable var _n_id: TId end class AImport special Prod end diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit index 0535648..b51ae9e 100644 --- a/src/parser/parser_prod.nit +++ b/src/parser/parser_prod.nit @@ -70,15 +70,15 @@ redef class AModule private init empty_init do end init init_amodule ( - n_packagedecl: nullable APackagedecl, + n_moduledecl: nullable AModuledecl, n_imports: Collection[Object], # Should be Collection[AImport] n_classdefs: Collection[Object] # Should be Collection[AClassdef] ) do empty_init - _n_packagedecl = n_packagedecl - if n_packagedecl != null then - n_packagedecl.parent = self + _n_moduledecl = n_moduledecl + if n_moduledecl != null then + n_moduledecl.parent = self end for n in n_imports do assert n isa AImport @@ -94,13 +94,13 @@ redef class AModule redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - if _n_packagedecl == old_child then + if _n_moduledecl == old_child then if new_child != null then new_child.parent = self - assert new_child isa APackagedecl - _n_packagedecl = new_child + assert new_child isa AModuledecl + _n_moduledecl = new_child else - _n_packagedecl = null + _n_moduledecl = null end return end @@ -132,8 +132,8 @@ redef class AModule redef fun visit_all(v: Visitor) do - if _n_packagedecl != null then - v.enter_visit(_n_packagedecl.as(not null)) + if _n_moduledecl != null then + v.enter_visit(_n_moduledecl.as(not null)) end for n in _n_imports do v.enter_visit(n) @@ -143,12 +143,12 @@ redef class AModule end end end -redef class APackagedecl +redef class AModuledecl private init empty_init do end - init init_apackagedecl ( + init init_amoduledecl ( n_doc: nullable ADoc, - n_kwpackage: nullable TKwpackage, + n_kwmodule: nullable TKwmodule, n_id: nullable TId ) do @@ -157,8 +157,8 @@ redef class APackagedecl if n_doc != null then n_doc.parent = self end - _n_kwpackage = n_kwpackage.as(not null) - n_kwpackage.parent = self + _n_kwmodule = n_kwmodule.as(not null) + n_kwmodule.parent = self _n_id = n_id.as(not null) n_id.parent = self end @@ -175,11 +175,11 @@ redef class APackagedecl end return end - if _n_kwpackage == old_child then + if _n_kwmodule == old_child then if new_child != null then new_child.parent = self - assert new_child isa TKwpackage - _n_kwpackage = new_child + assert new_child isa TKwmodule + _n_kwmodule = new_child else abort end @@ -202,7 +202,7 @@ redef class APackagedecl if _n_doc != null then v.enter_visit(_n_doc.as(not null)) end - v.enter_visit(_n_kwpackage) + v.enter_visit(_n_kwmodule) v.enter_visit(_n_id) end end diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit index faddda5..78ce89b 100644 --- a/src/syntax/mmbuilder.nit +++ b/src/syntax/mmbuilder.nit @@ -458,7 +458,7 @@ redef class AModule end end -redef class APackagedecl +redef class AModuledecl redef fun accept_class_builder(v) do if n_id.to_symbol != v.mmmodule.name then -- 1.7.9.5