Class declaration as statement @0.6

adamschmideg · adamschmideg · commit c5a8a37410b9 · 2011-12-12T23:48:07.000+01:00
diff --git a/csep.tests/src/csep/tests/ClassTest.xtend b/csep.tests/src/csep/tests/ClassTest.xtend
@@ -0,0 +1,20 @@
+package csep.tests
+
+import org.junit.Test
+
+class ClassTest extends ParserTestBase {
+	
+	@Test
+	def void testBasic() {
+		ok('''
+		  class NicePerson extends Person
+		    firstName: "John"
+		    lastName: "Doe"
+		    
+		    introduce: -> print "I am #{firstName} #{lastName}"
+		    
+		    greet: (other) ->
+		      print "Hello #{other}"
+		''')
+	}
+}
diff --git a/csep.tests/src/csep/tests/MissingFeaturesTest.xtend b/csep.tests/src/csep/tests/MissingFeaturesTest.xtend
@@ -56,4 +56,18 @@ class MissingFeaturesTest extends ParserTestBase {
 		''')
 		ok('a = readInfo() while true')
 	}
+	
+	@Test
+	def void testClass() {
+		// deeply nested class name
+		shouldBeOk('class a.b.c')
+		// class declaration as expression
+		shouldBeOk('c = class extends Foo') 
+		// class declaration as expression
+		shouldBeOk('class A extends B extends C')
+		// class name as property
+		shouldBeOk('class "str".length')
+		// class extends any expression
+		shouldBeOk('class A extends 3')
+	}
 }
diff --git a/csep/src/csep/CoffeeScript.xtext b/csep/src/csep/CoffeeScript.xtext
@@ -17,14 +17,23 @@ Line:
 	
 Stmt:
 	ReturnStmt |
-	ThrowStmt;
+	ThrowStmt |
+	ClassDeclaration;
 	
 ReturnStmt:
 	RETURN exp=Expression;
 	
 ThrowStmt:
 	THROW exp=Expression;
 	
+ClassDeclaration:
+	{ClassDeclaration}
+	CLASS (
+		body=Block |
+		(EXTENDS extend=Expression body=Block?) |
+		(name=(Id | Property) (EXTENDS extend=Expression)? body=Block)
+	)?;
+
 Expression:
 	Postfix;
 	
@@ -324,7 +333,7 @@ terminal RETURN: 'return';
 terminal RPAREN: ')';
 terminal STATEMENT: 'dummy STATEMENT';
 terminal STRING: '"' (('a'..'z') | ' ')* '"';
-terminal SUPER: 'dummy SUPER';
+terminal SUPER: 'super';
 terminal SWITCH: 'dummy SWITCH';
 terminal TERMINATOR: '\n'+;
 terminal THEN: 'dummy THEN';
