Ticket #336: chk-args-vs-param.patch

Source/Expr.cobra

@@ -2043 +2043 @@
 
         numPropertyInits = _verifyAndBindArgs(expr)
         _checkTypes(expr)
-        _type ?= _hoistType(expr)  # if _type not set in _checkTypes
+        _type ?= _hoistType(expr) # if _type not set in _checkTypes
 
-        # to-do: try and checkout initializer call
-
-        if _hasKeywordArg and numPropertyInits > 0 and not .isForAttribute and not .hasError                
+        #try and checkout initializer call
+        if .args.count-numPropertyInits>0 and expr inherits IdentifierExpr and expr.definition inherits ClassOrStruct and not .hasError
+            # we skip checks on 0 arg calls here for a more detailed message later from _paramsCountMsg
+            _checkInitializer(expr, numPropertyInits)
+            
+        if _hasKeywordArg and numPropertyInits >0 and not .isForAttribute and not .hasError             
             _makeHelperMethod
 
     def _verifyAndBindArgs(expr as Expr) as int 
@@ -2110 +2113 @@
                     initCall = initdefn
                 # to-do: verify args and params match exactly re count, assignability
                 # maybe adjust inheritance tree to use code from CallExpr...
-                /# 
+                /#
                 params = initCall.params
                 print params
                 if initCall inherits BoxMember # .no-warnings.
@@ -2123 +2126 @@
                                 
                 _checkVisibility(definition, expr)
                 #/
+            else
+                throw FallThroughException(initdefn)
         return initCall         
     
     def _argsToCallArgs as List<of Expr>
@@ -2192 +2197 @@
 
         return type
             
+    def _checkInitializer(expr as Expr, numPropertyInits as int)
+        assert expr inherits IdentifierExpr and expr.definition inherits ClassOrStruct
+        # skip passthrough in arg
+        if .args.count == 1 and .args[0].type == .typeProvider.passThroughType 
+            return
+        initCall = _bestInitializer
+        if not initCall
+            return
+        # skip paramlist vari Type  
+        if initCall.hasParams and initCall.params.count == 1 and initCall.params[0].type inherits VariType
+            return
+        # augment to check vari arg type same as vari param type
+        nDefaultedParams = 0
+        if initCall.hasParams
+            for p in initCall.params, if p.isOptional, nDefaultedParams += 1
+        pCount = initCall.params.count
+        argCount = .args.count - numPropertyInits
+        if not (argCount >= pCount - nDefaultedParams and argCount <= pCount)
+            wherePos ='(declared at [initCall.token.fileName]:[initCall.token.lineNum])'
+            dfltParams = if(nDefaultedParams, ' (with up to [nDefaultedParams] defaulted)', '')
+            paramStr = '[pCount] parameter' + if(pCount==1, '', 's')    
+            sugg = 'Best choice has [paramStr][dfltParams] [wherePos].'
+            args = if(numPropertyInits == 0, .args, _argsToCallArgs)
+            decl = _paramsVsArgsString(initCall.name, initCall.params, args)
+            paramStr = '[argCount] parameter' + if(argCount==1, '', 's')    
+            .throwError('No initializer in [expr.type.englishName] "[expr.toCobraSource]" with [paramStr]. [sugg][decl]')
+
     def _makeHelperMethod
         """
         Add a private helper method to the current box to support extended initializer.

Tests/120-classes/400-methods/600-named-params/850-bad-init.cobra

@@ -1 @@
-# Change this later when add Initializer checks
+# Changed for cobra compiler Initializer checks
 
 class BadI
 
     def main is shared
-        x = BadI('default', 0, 10)  # .error. not contain an initializer that takes
+        x = BadI('default', 0, 10)  # .error. No initializer in class "BadI" with 3 parameters
             # ... 3 arguments   - .NET
             # ... "3" arguments - Mono
         CobraCore.noOp(x)
@@ -11 +11 @@
     var x = ''
     var a = 0
     
-    cue init(sName as String, age as int)  # .warning. previous error
+    cue init(sName as String, age as int)  # (from csc) . warning. previous error
         base.init
         .x = sName
         .a = age

Tests/120-classes/328-construct-inheritance-error.cobra

@@ -6 +6 @@
 
 class B inherits A
 
-    cue init   # .warning. previous error
+    cue init    # (from csc) . warning. previous error
         base.init(0)
 
 
@@ -14 +14 @@
 
     def main
         B()
-        B(5)  # .error. argument
+        B(5)  # .error. no initializer