nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/doc: make GraphArticle a MEntity article since the graph is about a specific...
[nit.git]
/
src
/
nitserial.nit
diff --git
a/src/nitserial.nit
b/src/nitserial.nit
index
43907aa
..
98b1923
100644
(file)
--- a/
src/nitserial.nit
+++ b/
src/nitserial.nit
@@
-36,16
+36,16
@@
import template
class NitModule
super Template
class NitModule
super Template
- var header: nullable Streamable = null
+ var header: nullable Writable = null
# The module's name
# The module's name
- var name: Streamable
+ var name: Writable
# Imports from this module
# Imports from this module
- var imports = new Array[Streamable]
+ var imports = new Array[Writable]
# Main content of this module
# Main content of this module
- var content = new Array[Streamable]
+ var content = new Array[Writable]
redef fun rendering
do
redef fun rendering
do
@@
-53,7
+53,7
@@
class NitModule
if header != null then add header
var name = name
if header != null then add header
var name = name
- if name != null then add "module {name}\n\n"
+ add "module {name}\n\n"
for i in imports do add "import {i}\n"
add "\n"
for i in imports do add "import {i}\n"
add "\n"
@@
-127,7
+127,7
@@
end
var model = new Model
var modelbuilder = new ModelBuilder(model, toolcontext)
var model = new Model
var modelbuilder = new ModelBuilder(model, toolcontext)
-var mmodules = modelbuilder.parse(arguments)
+var mmodules = modelbuilder.parse_full(arguments)
modelbuilder.run_phases
# Create a distinct support module per targetted modules
modelbuilder.run_phases
# Create a distinct support module per targetted modules
@@
-149,7
+149,7
@@
for mmodule in mmodules do
module_name = "{mmodule.name}_serial"
module_path = null
else if module_path.has_suffix(".nit") then
module_name = "{mmodule.name}_serial"
module_path = null
else if module_path.has_suffix(".nit") then
- module_name = mmodule.name.basename(".nit")
+ module_name = module_path.basename(".nit")
else
module_name = module_path.basename("")
module_path += ".nit"
else
module_name = module_path.basename("")
module_path += ".nit"