nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pu/class_name' into wip
[nit.git]
/
src
/
compiling
/
compiling_global.nit
diff --git
a/src/compiling/compiling_global.nit
b/src/compiling/compiling_global.nit
index
ffb6708
..
1a8a817
100644
(file)
--- a/
src/compiling/compiling_global.nit
+++ b/
src/compiling/compiling_global.nit
@@
-24,17
+24,18
@@
redef class Program
# Compile module and class tables
fun compile_tables_to_c(v: CompilerVisitor)
do
# Compile module and class tables
fun compile_tables_to_c(v: CompilerVisitor)
do
- for m in module.mhe.greaters_and_self do
+ for m in main_module.mhe.greaters_and_self do
m.compile_local_table_to_c(v)
end
with_each_live_local_classes !action(c) do
m.compile_local_table_to_c(v)
end
with_each_live_local_classes !action(c) do
+ if c.global.is_abstract or c.global.is_interface then continue
c.compile_tables_to_c(v)
end
var s = new Buffer.from("classtable_t TAG2VFT[4] = \{NULL")
for t in ["Int","Char","Bool"] do
c.compile_tables_to_c(v)
end
var s = new Buffer.from("classtable_t TAG2VFT[4] = \{NULL")
for t in ["Int","Char","Bool"] do
- if module.has_global_class_named(t.to_symbol) then
+ if main_module.has_global_class_named(t.to_symbol) then
s.append(", (const classtable_t)VFT_{t}")
else
s.append(", NULL")
s.append(", (const classtable_t)VFT_{t}")
else
s.append(", NULL")
@@
-69,7
+70,7
@@
redef class MMModule
fun declare_class_tables_to_c(v: CompilerVisitor)
do
for c in local_classes do
fun declare_class_tables_to_c(v: CompilerVisitor)
do
for c in local_classes do
- if c.global.module == self then
+ if c.global.mmmodule == self then
c.declare_tables_to_c(v)
end
end
c.declare_tables_to_c(v)
end
end
@@
-115,7
+116,7
@@
redef class MMModule
# Compile module file for the current module
fun compile_local_table_to_c(v: CompilerVisitor)
do
# Compile module file for the current module
fun compile_local_table_to_c(v: CompilerVisitor)
do
- v.add_instr("const char *LOCATE_{name} = \"{location.file}\";")
+ v.add_instr("const char *LOCATE_{name} = \"{location.file.filename}\";")
if v.program.tc.use_SFT_optimization or local_table.is_empty then
return
if v.program.tc.use_SFT_optimization or local_table.is_empty then
return
@@
-280,6
+281,14
@@
redef class TableEltClassSelfId
end
end
end
end
+redef class TableEltClassSelfName
+ redef fun compile_to_c(v, c)
+ do
+ var prog = v.program
+ return "\"{c.global.name}\" /* {prog.table_information.color(self)}: Class Name */"
+ end
+end
+
redef class TableEltClassObjectSize
redef fun compile_to_c(v, c)
do
redef class TableEltClassObjectSize
redef fun compile_to_c(v, c)
do
@@
-323,11
+332,7
@@
redef class MMLocalClass
v.add_decl("")
var pi = primitive_info
v.add_decl("extern const classtable_elt_t VFT_{name}[];")
v.add_decl("")
var pi = primitive_info
v.add_decl("extern const classtable_elt_t VFT_{name}[];")
- if name == "NativeArray".to_symbol then
- v.add_decl("val_t NEW_NativeArray(size_t length, size_t size);")
- else if pi == null then
- # v.add_decl("val_t NEW_{name}(void);")
- else if not pi.tagged then
+ if pi != null and not pi.tagged then
var t = pi.cname
var tbox = "struct TBOX_{name}"
v.add_decl("{tbox} \{ const classtable_elt_t * vft; bigint object_id; {t} val;};")
var t = pi.cname
var tbox = "struct TBOX_{name}"
v.add_decl("{tbox} \{ const classtable_elt_t * vft; bigint object_id; {t} val;};")