FunctionSignature: Add abstract field

CASC-Lang · May 14, 2022 · 42ae195 · 42ae195
1 parent 0bbdc30
commit 42ae195
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 5 deletions.
diff --git a/src/main/kotlin/org/casc/lang/asm/CommonClassWriter.kt b/src/main/kotlin/org/casc/lang/asm/CommonClassWriter.kt
@@ -6,4 +6,10 @@ class CommonClassWriter(flags: Int, private val classLoader: ClassLoader) : Clas
     override fun getClassLoader(): ClassLoader {
         return classLoader
     }
+
+    override fun getCommonSuperClass(type1: String?, type2: String?): String {
+        // search common type from Table
+
+        return super.getCommonSuperClass(type1, type2)
+    }
 }
diff --git a/src/main/kotlin/org/casc/lang/ast/Constructor.kt b/src/main/kotlin/org/casc/lang/ast/Constructor.kt
@@ -34,6 +34,7 @@ data class Constructor(
             ownerType,
             companion = true,
             mutable = false,
+            abstract = false,
             accessor,
             "<init>",
             parameterTypes.mapNotNull { it },

diff --git a/src/main/kotlin/org/casc/lang/ast/Function.kt b/src/main/kotlin/org/casc/lang/ast/Function.kt
@@ -42,6 +42,7 @@ data class Function(
             ownerType,
             selfKeyword == null,
             mutKeyword != null,
+            abstrKeyword != null,
             accessor,
             name?.literal ?: "",
             parameterTypes!!.mapNotNull { it },

diff --git a/src/main/kotlin/org/casc/lang/checker/Checker.kt b/src/main/kotlin/org/casc/lang/checker/Checker.kt
@@ -96,6 +96,14 @@ class Checker(private val preference: AbstractPreference) {
             }
         }
 
+        if (clazz.traitImpls != null) {
+            clazz.traitImpls!!.forEach {
+                it.functions.forEach {
+
+                }
+            }
+        }
+
         return classScope
     }
 
@@ -133,6 +141,14 @@ class Checker(private val preference: AbstractPreference) {
             }
         }
 
+        if (trait.traitImpls != null) {
+            trait.traitImpls!!.forEach {
+                it.functions.forEach {
+
+                }
+            }
+        }
+
         return traitScope
     }
 
@@ -378,7 +394,7 @@ class Checker(private val preference: AbstractPreference) {
         return constructor
     }
 
-    private fun checkFunction(function: Function, scope: Scope): Function {
+    private fun checkFunction(function: Function, scope: Scope, searchTraitFunction: Boolean = false): Function {
         val localScope = Scope(scope)
         checkIdentifierIsKeyword(function.name?.literal, function.name?.pos)
 
@@ -527,6 +543,7 @@ class Checker(private val preference: AbstractPreference) {
                 ClassType.OBJECT_TYPE,
                 companion = true,
                 mutable = false,
+                abstract = false,
                 Accessor.Pub,
                 "<init>",
                 listOf(),

diff --git a/src/main/kotlin/org/casc/lang/emitter/Emitter.kt b/src/main/kotlin/org/casc/lang/emitter/Emitter.kt
@@ -370,8 +370,8 @@ class Emitter(private val preference: AbstractPreference, private val declaratio
                     // Use INVOKEVIRTUAL instead
                     methodVisitor.visitMethodInsn(
                         when {
-                            expression.superCall -> Opcodes.INVOKESPECIAL
                             functionSignature.ownerType?.isTrait == true -> Opcodes.INVOKEINTERFACE
+                            expression.superCall -> Opcodes.INVOKESPECIAL
                             else -> Opcodes.INVOKEVIRTUAL
                         },
                         functionSignature.ownerReference.internalName(),

diff --git a/src/main/kotlin/org/casc/lang/table/FunctionSignature.kt b/src/main/kotlin/org/casc/lang/table/FunctionSignature.kt
@@ -12,6 +12,7 @@ data class FunctionSignature(
     val ownerType: ClassType?,
     val companion: Boolean,
     val mutable: Boolean,
+    val abstract: Boolean,
     override val accessor: Accessor,
     val name: String,
     val parameters: List<Type>,
@@ -21,7 +22,8 @@ data class FunctionSignature(
         Reference(ownerClass),
         TypeUtil.asType(ownerClass, preference) as ClassType,
         Modifier.isStatic(function.modifiers),
-        Modifier.isFinal(function.modifiers),
+        !Modifier.isFinal(function.modifiers),
+        Modifier.isAbstract(function.modifiers),
         Accessor.fromModifier(function.modifiers),
         function.name,
         function.parameterTypes.map { TypeUtil.asType(it, preference)!! },

diff --git a/src/main/kotlin/org/casc/lang/table/Scope.kt b/src/main/kotlin/org/casc/lang/table/Scope.kt
@@ -200,6 +200,7 @@ data class Scope(
                             TypeUtil.asType(ownerClazz, preference) as ClassType,
                             companion = true,
                             mutable = false,
+                            abstract = false,
                             Accessor.fromModifier(constructor.modifiers),
                             functionName,
                             constructor.parameterTypes.map { TypeUtil.asType(it, preference)!! },

diff --git a/src/test/resources/validate/project/Animal.casc b/src/test/resources/validate/project/Animal.casc
@@ -2,4 +2,5 @@ trait Animal {
 }
 
 impl Animal {
+    fn roar(self)
 }
diff --git a/src/test/resources/validate/project/Atom.casc b/src/test/resources/validate/project/Atom.casc
@@ -9,4 +9,6 @@ impl Atom {
     }
 }
 
-impl Atom for Animal
+impl Atom for Animal {
+    ovrd fn roar(self) {}
+}
diff --git a/src/test/resources/validate/project/Rock.casc b/src/test/resources/validate/project/Rock.casc
@@ -21,7 +21,7 @@ impl Rock: Atom {
         } else {
             new Rock("")
         }
-        a.hello()
+        a.roar()
     }
 
     mut fn lol(self): i32 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ trait Animal { @@
     }
     impl Animal {
+        fn roar(self)
     }