Tests fixed

2010-12-22 19:46:09 +03:00
parent cfcb9d7d7d
commit 407a8e1684
8 changed files with 166 additions and 37 deletions
@@ -0,0 +1,5 @@
+namespace foo
+
+class Runnable<a,a>(a : doo = 0) : foo(d=0), ,bar by x, bar {
+
+}
@@ -0,0 +1,75 @@
+JetFile: BabySteps_ERR.jet
+  NAMESPACE
+    PsiElement(namespace)('namespace')
+    PsiWhiteSpace(' ')
+    NAMESPACE_NAME
+      PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace('\n\n')
+    CLASS
+      PsiElement(class)('class')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('Runnable')
+      TYPE_PARAMETER_LIST
+        PsiElement(LT)('<')
+        TYPE_PARAMETER
+          PsiElement(IDENTIFIER)('a')
+        PsiElement(COMMA)(',')
+        TYPE_PARAMETER
+          PsiElement(IDENTIFIER)('a')
+        PsiElement(GT)('>')
+      PRIMARY_CONSTRUCTOR_PARAMETERS_LIST
+        PsiElement(LPAR)('(')
+        PRIMARY_CONSTRUCTOR_PARAMETER
+          PsiElement(IDENTIFIER)('a')
+          PsiWhiteSpace(' ')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              PsiElement(IDENTIFIER)('doo')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          PsiElement(INTEGER_LITERAL)('0')
+        PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      DELEGATION_SPECIFIER_LIST
+        DELEGATION_SPECIFIER
+          DELEGATOR_SUPER_CALL
+            TYPE_REFERENCE
+              USER_TYPE
+                PsiElement(IDENTIFIER)('foo')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              NAMED_ARGUMENT
+                PsiElement(IDENTIFIER)('d')
+                PsiElement(EQ)('=')
+                PsiElement(INTEGER_LITERAL)('0')
+              PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Expecting a delegation specifier
+          PsiElement(COMMA)(',')
+        DELEGATION_SPECIFIER
+          DELEGATOR_BY
+            TYPE_REFERENCE
+              USER_TYPE
+                PsiElement(IDENTIFIER)('bar')
+            PsiWhiteSpace(' ')
+            PsiElement(by)('by')
+            PsiWhiteSpace(' ')
+            PsiElement(IDENTIFIER)('x')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        DELEGATION_SPECIFIER
+          DELEGATOR_SUPER_CLASS
+            TYPE_REFERENCE
+              USER_TYPE
+                PsiElement(IDENTIFIER)('bar')
+      PsiWhiteSpace(' ')
+      CLASS_BODY
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n\n')
+        PsiElement(RBRACE)('}')
@@ -22,4 +22,8 @@ class foo {

    }

+    this() : - {
+
+    }
+
 }
@@ -182,5 +182,22 @@ JetFile: SimpleClassMembers_ERR.jet
            PsiElement(LBRACE)('{')
            PsiWhiteSpace('\n\n    ')
            PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n\n    ')
+        CONSTRUCTOR
+          PsiElement(this)('this')
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          INITIALIZER_LIST
+            PsiErrorElement:Expecting constructor call (this(...)) or supertype initializer
+              PsiElement(MINUS)('-')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiWhiteSpace('\n\n    ')
+            PsiElement(RBRACE)('}')
        PsiWhiteSpace('\n\n')
        PsiElement(RBRACE)('}')
@@ -109,7 +109,63 @@ ref
        public    : t,
        private   : t,
        protected : t,
-        internal  : t
+        internal  : t,
+    public protected private internal abstract
+    virtual
+    enum
+    open
+    attribute
+    override
+    virtual
+    abstract
+    private
+    protected
+    public
+    internal
+    lazy open : t
+
     )

 }
+
+
+class F(val foo : bar,
+        abstract  : t,
+        virtual   : t,
+        enum      : t,
+        open      : t,
+        attribute : t,
+        override  : t,
+        virtual   : t,
+        abstract  : t,
+        private   : t,
+        protected : t,
+        public    : t,
+        internal  : t,
+        lazy      : t,
+        wraps     : t,
+        import    : t,
+        where     : t,
+        by        : t,
+        get       : t,
+        set       : t,
+        public    : t,
+        private   : t,
+        protected : t,
+        internal  : t,
+    public protected private internal abstract
+    virtual
+    enum
+    open
+    attribute
+    override
+    virtual
+    abstract
+    private
+    protected
+    public
+    internal
+    lazy open : b
+) {
+
+}