Fixes in GroovyLanguage
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 09 Apr 2014 14:30:16 +0200
changeset 3063 3ac1f611b373
parent 3062 a3f6e540a232
child 3064 fcbadfecc4d7
Fixes in GroovyLanguage * #metaClass should return GroovyMetaclass. not (Smalltalk) Metaclass * remove wrong assertion in #classTemplateFor:...
GroovyLanguage.st
--- a/GroovyLanguage.st	Wed Apr 09 10:00:16 2014 +0200
+++ b/GroovyLanguage.st	Wed Apr 09 14:30:16 2014 +0200
@@ -91,6 +91,15 @@
     "Created: / 18-02-2012 / 14:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+metaClass
+    "will be used for new classes (in the class wizard);
+     a fallback here"
+
+    ^ GroovyMetaclass
+
+    "Created: / 09-04-2014 / 12:28:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 parserClass
     "Answer a class suitable for parsing a source code in 'my' language"
 
@@ -160,9 +169,8 @@
     | sclass |
 
     self assert: isNamespace not.
-    self assert: ((superClass == Object) or:[superClass isJavaClass]).
 
-    sclass := superClass == Object ifTrue:[JavaVM classForName:'java.lang.Object'] ifFalse:[superClass].
+    sclass := ((superClass == Object) or:[superClass isJavaClass not]) ifTrue:[JavaVM classForName:'java.lang.Object'] ifFalse:[superClass].
 
     ^'//import stx.libjava.annotations.Category;
 //@Category("%(CATEGORY)")
@@ -178,7 +186,7 @@
             yourself)
 
     "Created: / 18-02-2012 / 18:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-05-2013 / 11:21:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-04-2014 / 12:36:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !GroovyLanguage class methodsFor:'documentation'!