Changeset 1043

Timestamp:

02/15/10 15:17:06 (5 months ago)

Author:

weyrick

Message:

classDecl interface and dump

Location:

trunk/rphp

Files:

• compiler/analysis/passes/DumpAST.cpp (modified) (1 diff)
• include/rphp/analysis/pAST.h (modified) (6 diffs)

trunk/rphp/compiler/analysis/passes/DumpAST.cpp

@@ -92 +92 @@
 
 void DumpAST::visit_pre_classDecl(classDecl* n) {
-    currentElement_->SetAttribute("id",n->name());
+
+    currentElement_->SetAttribute("id",n->name());
+    TiXmlElement* sub, *node;
+
+    switch (n->classType()) {
+    case classDecl::ABSTRACT:
+        currentElement_->SetAttribute("type","ABSTRACT");
+        break;
+    case classDecl::FINAL:
+        currentElement_->SetAttribute("type","FINAL");
+        break;
+    case classDecl::IFACE:
+        currentElement_->SetAttribute("type","INTERFACE");
+        break;
+    case classDecl::NORMAL:
+        currentElement_->SetAttribute("type","NORMAL");
+        break;
+    }
+
+    if (n->implementsCount()) {
+
+        sub = new TiXmlElement("implements");
+        for (AST::idList::iterator i = n->implements_begin();
+             i != n->implements_end();
+             ++i)
+        {
+            // synthesize literal id nodes here
+            node = new TiXmlElement("literalID");
+            node->SetAttribute("id", *(*i));
+            sub->LinkEndChild(node);
+        }
+        currentElement_->LinkEndChild(sub);
+
+    }
+    else {
+        doComment("implements none");
+    }
+
+    if (n->extendsCount()) {
+
+        sub = new TiXmlElement("extends");
+        for (AST::idList::iterator i = n->extends_begin();
+             i != n->extends_end();
+             ++i)
+        {
+            // synthesize literal id nodes here
+            node = new TiXmlElement("literalID");
+            node->SetAttribute("id", *(*i));
+            sub->LinkEndChild(node);
+        }
+        currentElement_->LinkEndChild(sub);
+
+    }
+    else {
+        doComment("extends none");
+    }
+
+
 }
 

trunk/rphp/include/rphp/analysis/pAST.h

@@ -663 +663 @@
 public:
 
-    enum classType { NORMAL, IFACE, FINAL, ABSTRACT };
+    enum classTypes { NORMAL,
+                      IFACE, // "INTERFACE" is keyword? throws error
+                      FINAL,
+                      ABSTRACT };
 
 private:
@@ -669 +672 @@
     idList extends_;
     idList implements_;
-    classType type_;
+    classTypes classType_;
     block* members_;
     
@@ -677 +680 @@
     classDecl(const classDecl& other, pParseContext& C): decl(other),
         name_(other.name_), extends_(other.extends_), implements_(other.implements_),
-        type_(other.type_), members_(0)
+        classType_(other.classType_), members_(0)
     {
         if(other.members_)
@@ -686 +689 @@
     classDecl(pParseContext& C,
               const pSourceRange& name,
-              classType type,
+              classTypes type,
               const sourceRangeList* extends, // may be null
               const sourceRangeList* implements, // may be null
@@ -695 +698 @@
         extends_(),
         implements_(),
-        type_(type),
+        classType_(type),
         members_(members)
     {
@@ -726 +729 @@
         return *name_;
     }
+
     block* members(void) { return members_; }
+
+    classTypes classType(void) const { return classType_; }
+
+    pUInt implementsCount(void) const { return implements_.size(); }
+    pUInt extendsCount(void) const { return extends_.size(); }
 
     stmt::child_iterator child_begin() { return (stmt**)&members_; }
     stmt::child_iterator child_end() { return (stmt**)&members_+1; }
+
+    idList::iterator extends_begin() { return extends_.begin(); }
+    idList::iterator extends_end() { return extends_.end(); }
+
+    idList::iterator implements_begin() { return implements_.begin(); }
+    idList::iterator implements_end() { return implements_.end(); }
 
     IMPLEMENT_SUPPORT_MEMBERS(classDecl);