nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syntax: 'meth' -> 'fun', 'attr' -> 'var'
[nit.git]
/
src
/
syntax
/
syntax.nit
diff --git
a/src/syntax/syntax.nit
b/src/syntax/syntax.nit
index
1bc71de
..
72989bd
100644
(file)
--- a/
src/syntax/syntax.nit
+++ b/
src/syntax/syntax.nit
@@
-20,7
+20,6
@@
package syntax
import mmloader
import mmbuilder
import mmloader
import mmbuilder
-import control_flow
import typing
# Loader of nit source files
import typing
# Loader of nit source files
@@
-28,9
+27,9
@@
class SrcModuleLoader
special ModuleLoader
redef type MODULE: MMSrcModule
special ModuleLoader
redef type MODULE: MMSrcModule
- redef meth file_type do return "nit"
+ redef fun file_type do return "nit"
- redef meth parse_file(context, file, filename, name, dir)
+ redef fun parse_file(context, file, filename, name, dir)
do
var lexer = new Lexer(file, filename)
var parser = new Parser(lexer)
do
var lexer = new Lexer(file, filename)
var parser = new Parser(lexer)
@@
-43,13
+42,11
@@
special ModuleLoader
end
var node_module = node_tree.n_base
assert node_module isa AModule
end
var node_module = node_tree.n_base
assert node_module isa AModule
- var module = new MMSrcModule(context, node_module, dir, name)
- #module.filename = fname
- #module.mtime = fname.file_stat.mtime
+ var module = new MMSrcModule(context, node_module, dir, name, filename)
return module
end
return module
end
- redef meth process_metamodel(context, module)
+ redef fun process_metamodel(context, module)
do
module.process_supermodules(context)
module.process_syntax(context)
do
module.process_supermodules(context)
module.process_syntax(context)
@@
-58,33
+55,22
@@
special ModuleLoader
init do end
end
init do end
end
-redef class MMContext
- # The current configuration/status of the tool
- readable writable attr _tc: ToolContext
-end
-
redef class MMSrcModule
# Loading and syntax analysis of super modules
redef class MMSrcModule
# Loading and syntax analysis of super modules
- private meth process_supermodules(tc: ToolContext)
+ private fun process_supermodules(tc: ToolContext)
do
node.import_super_modules(tc, self)
do
node.import_super_modules(tc, self)
-
end
# Syntax analysis and MM construction for the module
# Require than supermodules are processed
end
# Syntax analysis and MM construction for the module
# Require than supermodules are processed
- private meth process_syntax(tc: ToolContext)
+ private fun process_syntax(tc: ToolContext)
do
do_mmbuilder(tc)
if tc.error_count > 0 then exit(1)
do_typing(tc)
if tc.error_count > 0 then exit(1)
do
do_mmbuilder(tc)
if tc.error_count > 0 then exit(1)
do_typing(tc)
if tc.error_count > 0 then exit(1)
-
- do_control_flow(tc)
- if tc.error_count > 0 then exit(1)
-
end
end
-
end
end