Diff of /cmajor++/Cm/Cm.Core/MemberFunction.hpp [r367] .. [r368]  Maximize  Restore

Switch to side-by-side view

--- a/cmajor++/Cm/Cm.Core/MemberFunction.hpp
+++ b/cmajor++/Cm/Cm.Core/MemberFunction.hpp
@@ -45,6 +45,7 @@
     int VirtualFunctionTableIndex() const { return vtblIndex; }
     virtual void TypeCheckSignature(TypeCheckContext& context);
     virtual void TypeCheckBody(TypeCheckContext& context);
+    virtual void CollectExternalObjects(CompilationUnitPtr compilationUnit);
     const FunctionPtrSet& Overrides() const { return overrides; }
     void AddToOverrides(const FunctionPtr& f) { overrides.insert(f); }
     virtual std::string GetParsingName() const;
@@ -58,12 +59,10 @@
     virtual FunctionCallPtr GetStaticConstructorCall() const { return staticCtorCall; }
     virtual GenResult GenerateStaticConstructorCall(Ir& ir, GenFlags flags);
     virtual bool HasThisVariable() const { return true; }
-    virtual void CheckIfCanThrow(bool& canThrow, TypeCheckContext& context);
     void SetBodySource(CompoundStatementPtr bodySource_) { bodySource = bodySource_; }
     void SetMemberIndex(int memberIndex_) { memberIndex = memberIndex_; }
     int GetMemberIndex() const { return memberIndex; }
-    virtual void MarkToBeInstantiated();
-    void Instantiate(TypeCheckContext& context);
+    virtual void Instantiate(TypeCheckContext& context);
     CompoundStatementPtr BodySource() const { return bodySource; }
     void SetInitializerSource(const InitializerList& initializerSource_);
     const InitializerList& InitializerSource() const { return initializerSource; }
@@ -102,11 +101,9 @@
     virtual std::string ShortDocName() const;
     virtual std::string AliasOrShortTypeDocName() const;
     virtual std::string SyntaxName() const;
-    virtual void CollectExternalObjects(CompilationUnitPtr compilationUnit, ObjectSet& externalObjects, bool deep);
     virtual FunctionCallPtr GetStaticConstructorCall() const { return staticCtorCall; }
     virtual GenResult GenerateStaticConstructorCall(Ir& ir, GenFlags flags);
     virtual InitializerList Initializers() const { return initializers; }
-    virtual void SetCompilationUnit(CompilationUnitPtr compilationUnit);
     void SetInitializers(const InitializerList& initializers_);
 private:
     InitializerPtr classInitializer;
@@ -133,7 +130,6 @@
     virtual void TypeCheckBody(TypeCheckContext& context);
     ScopePtr InitializerScope() const { return initializerScope; }
     void SetInitializerScope(const ScopePtr& initializerScope_) { initializerScope = initializerScope_; }
-    virtual void CollectExternalObjects(CompilationUnitPtr compilationUnit, ObjectSet& externalObjects, bool deep);
     virtual bool HasThisVariable() const { return false; }
     virtual InitializerList Initializers() const { return initializers; }
     void SetInitializers(const InitializerList& initializers_);

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks