diff options
| author | Adrian Thurston <thurston@complang.org> | 2015-01-10 15:36:03 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2015-01-10 15:36:03 -0500 |
| commit | ca923f14202030ea69729b60734c94b4584783c0 (patch) | |
| tree | cac993451dfc53883460e52e7dea40423985fb44 /src/parsetree.h | |
| parent | b45f08baf7ac6a1846b7bc80c0fc01d278f2a41b (diff) | |
| download | colm-ca923f14202030ea69729b60734c94b4584783c0.tar.gz | |
more object semantics fixes and test case updates
Diffstat (limited to 'src/parsetree.h')
| -rw-r--r-- | src/parsetree.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/parsetree.h b/src/parsetree.h index bb60ee6d..0beb2e76 100644 --- a/src/parsetree.h +++ b/src/parsetree.h @@ -716,7 +716,7 @@ struct GenericType : typeId(typeId), id(id), typeArg(typeArg), keyTypeArg(0), - utArg(0), keyUT(0), objDef(0), elOffset(0) + utArg(0), keyUT(0), objDef(0), el(0), elOffset(0) {} void declare( Compiler *pd, Namespace *nspace ); @@ -2177,7 +2177,9 @@ struct ObjectMethod useCallObj(true), func(0), iterDef(0), - useFnInstr(false) + useFnInstr(false), + useGenericId(false), + generic(0) { } @@ -2279,6 +2281,8 @@ struct ObjectField inSetWC( IN_HALT ), inSetWV( IN_HALT ), inGetValR( IN_HALT ), + inGetValWC( IN_HALT ), + inGetValWV( IN_HALT ), inSetValWC( IN_HALT ), inSetValWV( IN_HALT ) {} @@ -2359,6 +2363,8 @@ struct ObjectField Code inSetWC; Code inSetWV; Code inGetValR; + Code inGetValWC; + Code inGetValWV; Code inSetValWC; Code inSetValWV; |