Changeset 14502 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

May 20, 2006, 1:19:22 PM (19 years ago)

Author:

andersca

Message:

JavaScriptCore:

2006-05-20 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8993
Support function declaration in case statements

• kjs/grammar.y: Get rid of StatementList and use SourceElements instead.

• kjs/nodes.cpp: (CaseClauseNode::evalStatements): (CaseClauseNode::processVarDecls): (CaseClauseNode::processFuncDecl): (ClauseListNode::processFuncDecl): (CaseBlockNode::processFuncDecl): (SwitchNode::processFuncDecl):
• kjs/nodes.h: (KJS::CaseClauseNode::CaseClauseNode): (KJS::ClauseListNode::ClauseListNode): (KJS::ClauseListNode::getClause): (KJS::ClauseListNode::getNext): (KJS::ClauseListNode::releaseNext): (KJS::SwitchNode::SwitchNode): Add processFuncDecl for the relevant nodes.

• kjs/nodes2string.cpp: (CaseClauseNode::streamTo): next got renamed to source.

LayoutTests:

2006-05-20 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

• fast/js/function-declarations-in-switch-statement-expected.txt: Added.
• fast/js/function-declarations-in-switch-statement.html: Added.
• fast/js/resources/function-declarations-in-switch-statement.js: Added.

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -735 +735 @@
   };
 
-  class StatListNode : public StatementNode {
-  public:
-    // list pointer is tail of a circular list, cracked in the CaseClauseNode ctor
-    StatListNode(StatementNode *s);
-    StatListNode(StatListNode *l, StatementNode *s);
-    virtual Completion execute(ExecState*);
-    virtual void processVarDecls(ExecState*);
-    virtual void streamTo(SourceStream&) const;
-    PassRefPtr<StatListNode> releaseNext() { return next.release(); }
-    virtual void breakCycle();
-  private:
-    friend class CaseClauseNode;
-    RefPtr<StatementNode> statement;
-    ListRefPtr<StatListNode> next;
-  };
-
   class AssignExprNode : public Node {
   public:
@@ -932 +916 @@
     RefPtr<Node> expr;
     RefPtr<StatementNode> statement;
-  };
-
-  class CaseClauseNode : public Node {
-  public:
-    CaseClauseNode(Node *e) : expr(e) { }
-    CaseClauseNode(Node *e, StatListNode *l)
-      : expr(e), next(l->next.release()) { Parser::removeNodeCycle(next.get()); }
-    JSValue* evaluate(ExecState*);
-    Completion evalStatements(ExecState*);
-    virtual void processVarDecls(ExecState*);
-    virtual void streamTo(SourceStream&) const;
-  private:
-    RefPtr<Node> expr;
-    RefPtr<StatListNode> next;
-  };
-
-  class ClauseListNode : public Node {
-  public:
-    // list pointer is tail of a circular list, cracked in the CaseBlockNode ctor
-    ClauseListNode(CaseClauseNode *c) : clause(c), next(this) { Parser::noteNodeCycle(this); }
-    ClauseListNode(ClauseListNode *n, CaseClauseNode *c)
-      : clause(c), next(n->next) { n->next = this; }
-    JSValue* evaluate(ExecState*);
-    CaseClauseNode *getClause() const { return clause.get(); }
-    ClauseListNode *getNext() const { return next.get(); }
-    virtual void processVarDecls(ExecState*);
-    virtual void streamTo(SourceStream&) const;
-    PassRefPtr<ClauseListNode> releaseNext() { return next.release(); }
-    virtual void breakCycle();
-  private:
-    friend class CaseBlockNode;
-    RefPtr<CaseClauseNode> clause;
-    ListRefPtr<ClauseListNode> next;
-  };
-
-  class CaseBlockNode : public Node {
-  public:
-    CaseBlockNode(ClauseListNode *l1, CaseClauseNode *d, ClauseListNode *l2);
-    JSValue* evaluate(ExecState*);
-    Completion evalBlock(ExecState *exec, JSValue *input);
-    virtual void processVarDecls(ExecState*);
-    virtual void streamTo(SourceStream&) const;
-  private:
-    RefPtr<ClauseListNode> list1;
-    RefPtr<CaseClauseNode> def;
-    RefPtr<ClauseListNode> list2;
-  };
-
-  class SwitchNode : public StatementNode {
-  public:
-    SwitchNode(Node *e, CaseBlockNode *b) : expr(e), block(b) { }
-    virtual Completion execute(ExecState*);
-    virtual void processVarDecls(ExecState*);
-    virtual void streamTo(SourceStream&) const;
-  private:
-    RefPtr<Node> expr;
-    RefPtr<CaseBlockNode> block;
   };
 
@@ -1088 +1015 @@
   class SourceElementsNode : public StatementNode {
   public:
-      static int count;
+    static int count;
     // list pointer is tail of a circular list, cracked in the BlockNode (or subclass) ctor
     SourceElementsNode(StatementNode*);
@@ -1101 +1028 @@
   private:
     friend class BlockNode;
+    friend class CaseClauseNode;
     RefPtr<StatementNode> node;
     ListRefPtr<SourceElementsNode> next;
   };
 
+  class CaseClauseNode : public Node {
+  public:
+      CaseClauseNode(Node *e) : expr(e) { }
+      CaseClauseNode(Node *e, SourceElementsNode *s)
+      : expr(e), source(s->next.release()) { Parser::removeNodeCycle(source.get()); }
+      JSValue* evaluate(ExecState*);
+      Completion evalStatements(ExecState*);
+      void processFuncDecl(ExecState*);
+      virtual void processVarDecls(ExecState*);
+      virtual void streamTo(SourceStream&) const;
+  private:
+      RefPtr<Node> expr;
+      RefPtr<SourceElementsNode> source;
+  };
+  
+  class ClauseListNode : public Node {
+  public:
+      // list pointer is tail of a circular list, cracked in the CaseBlockNode ctor
+      ClauseListNode(CaseClauseNode *c) : clause(c), next(this) { Parser::noteNodeCycle(this); }
+      ClauseListNode(ClauseListNode *n, CaseClauseNode *c)
+      : clause(c), next(n->next) { n->next = this; }
+      JSValue* evaluate(ExecState*);
+      CaseClauseNode *getClause() const { return clause.get(); }
+      ClauseListNode *getNext() const { return next.get(); }
+      virtual void processVarDecls(ExecState*);
+      void processFuncDecl(ExecState*);
+      virtual void streamTo(SourceStream&) const;
+      PassRefPtr<ClauseListNode> releaseNext() { return next.release(); }
+      virtual void breakCycle();
+  private:
+      friend class CaseBlockNode;
+      RefPtr<CaseClauseNode> clause;
+      ListRefPtr<ClauseListNode> next;
+  };
+  
+  class CaseBlockNode : public Node {
+  public:
+      CaseBlockNode(ClauseListNode *l1, CaseClauseNode *d, ClauseListNode *l2);
+      JSValue* evaluate(ExecState*);
+      Completion evalBlock(ExecState *exec, JSValue *input);
+      virtual void processVarDecls(ExecState*);
+      void processFuncDecl(ExecState*);
+      virtual void streamTo(SourceStream&) const;
+  private:
+      RefPtr<ClauseListNode> list1;
+      RefPtr<CaseClauseNode> def;
+      RefPtr<ClauseListNode> list2;
+  };
+  
+  class SwitchNode : public StatementNode {
+  public:
+      SwitchNode(Node *e, CaseBlockNode *b) : expr(e), block(b) { }
+      virtual Completion execute(ExecState*);
+      virtual void processVarDecls(ExecState*);
+      virtual void processFuncDecl(ExecState*);
+      virtual void streamTo(SourceStream&) const;
+  private:
+      RefPtr<Node> expr;
+      RefPtr<CaseBlockNode> block;
+  };
+  
   class ProgramNode : public FunctionBodyNode {
   public: