nac3core: Add field "constructor_lookup" to the struct TopLevelComposer #308

z78078 · 2022-07-20T17:38:05+08:00

z78078 commented

2022-07-20 17:38:05 +08:00

The code below failed because the InnerResolver's 'pyid_to_type' table didn't store the type information for the classes that don't have their own constructor.

@nac3
class A
    @kernel
    def __init__(self):
        pass


@nac3
class B(A):
    pass


@nac3
class C(B):
    pass


@nac3
class Demo:
    core: KernelInvariant[Core]

    def __init__(self):
        self.core = Core()

    @kernel
    def run(self):
    	c = C()

>>>
nac3artiq.CompileError: compilation failed
----------
type error at identifier `C` (<class 'type'> is not registered with NAC3 (@nac3 decorator missing?))

In the register step, TopLevelComposer::reigster_top_level won't return the constructor's type of the class that doesn't have a constructor and therefore the 'pyid_to_type' will not be abled to store the type information for the class (the ty is None here).

This change add a field 'constructor_lookup' (HashMap) to TopLevelComposer which maintain a mapping between class name to constructor function definition.

With the 'constructor_lookup' table, the TopLevelComposer::reigster_top_level will be able to recognize and return the constructor's type for classes that inherit constructor function from its base class and 'pyid_to_type' will store the type information for the class as a result.

The code below failed because the InnerResolver's 'pyid_to_type' table didn't store the type information for the classes that don't have their own constructor. ``` @nac3 class A @kernel def __init__(self): pass @nac3 class B(A): pass @nac3 class C(B): pass @nac3 class Demo: core: KernelInvariant[Core] def __init__(self): self.core = Core() @kernel def run(self): c = C() >>> nac3artiq.CompileError: compilation failed ---------- type error at identifier `C` (<class 'type'> is not registered with NAC3 (@nac3 decorator missing?)) ``` In the register step, TopLevelComposer::reigster_top_level won't return the constructor's type of the class that doesn't have a constructor and therefore the 'pyid_to_type' will not be abled to store the type information for the class (the ty is None [here](https://git.m-labs.hk/M-Labs/nac3/src/branch/master/nac3artiq/src/lib.rs#L416-L418)). This change add a field 'constructor_lookup' (HashMap) to TopLevelComposer which maintain a mapping between class name to constructor function definition. With the 'constructor_lookup' table, the TopLevelComposer::reigster_top_level will be able to recognize and return the constructor's type for classes that inherit constructor function from its base class and 'pyid_to_type' will store the type information for the class as a result.

z78078 added 6 commits 2022-07-20 17:38:05 +08:00

nac3core: Add field constructor_lookup(HashMap) to the TopLevelComposer and the function build_constructor_lookup to build the HashMap 71308ae5d4

nac3core: Add field constructor_lookup(HashMap) to the TopLevelComposer and the function build_constructor_lookup to build the HashMap 7d68efc599

nac3core: src/toplevel/composer.rs fix the constructor propagation bug in function build_constructor_lookup a6bd6d5567

nac3core: Add test for toplevel::composer::build_constructor_lookup 510eaae73a

update comment ad12b7e958

nac3core: update comment c43be7388d

sb10q reviewed 2022-07-20 17:38:40 +08:00

nac3core/src/toplevel/composer.rs Outdated

						
				@ -37,6 +37,8 @@ pub struct TopLevelComposer {

				    // number of built-in function and classes in the definition list, later skip

				    pub builtin_num: usize,

				    pub core_config: ComposerConfig,

				    // the class name and it's constructor function

sb10q commented

2022-07-20 17:38:40 +08:00

its

sb10q commented

2022-07-20 17:39:46 +08:00

It is not clear from your description whether this fixes issue #139 or not.

Why do constructors need such special treatment compared to other inherited methods?

It is not clear from your description whether this fixes issue #139 or not. Why do constructors need such special treatment compared to other inherited methods?

z78078 added 2 commits 2022-07-21 09:57:01 +08:00

nac3core: fix typo and remove the unnecessary 'return' statement 6eb433b2e3

nac3core: fix test assertion 2ec449545e

z78078 added 1 commit 2022-07-21 15:39:05 +08:00

nac3core: coding style change ead8b6f68d

z78078 closed this pull request

2022-07-25 11:47:27 +08:00