Check for too many arg_names supplied for a method

Author: krame505

src/Libraries/Base1/Prelude.bs

@@ -4561,15 +4561,23 @@ instance (SplitPorts a p, TupleSize p n, WrapPorts p pb, WrapMethod b v, Curry (
 instance (Bits a n) => WrapMethod (ActionValue a) (ActionValue_ n) where
   toWrapMethod = toActionValue_
   fromWrapMethod = fromActionValue_
-  methodArgBaseNames _ _ _ _ = Nil
-  inputPortNames _ _ = Nil
+  methodArgBaseNames _ _ Nil _ = Nil
+  methodArgBaseNames prx prefix argNames _ =
+    primError (getEvalPosition prx) $ integerToString (listLength argNames) +++
+    " excess arg_names provided for method " +++ prefix
+  inputPortNames _ Nil = Nil
+  inputPortNames _ (Cons _ _) = error "inputPortNames: uncaught excess arg names"
   saveMethodPortTypes _ modName _ result = primSavePortType modName result $ typeOf (_ :: a)
 
 instance (Bits a n) => WrapMethod a (Bit n) where
   toWrapMethod = pack
   fromWrapMethod = unpack
-  methodArgBaseNames _ _ _ _ = Nil
-  inputPortNames _ _ = Nil
+  methodArgBaseNames _ _ Nil _ = Nil
+  methodArgBaseNames prx prefix argNames _ =
+    primError (getEvalPosition prx) $ integerToString (listLength argNames) +++
+    " excess arg_names provided for method " +++ prefix
+  inputPortNames _ Nil = Nil
+  inputPortNames _ (Cons _ _) = error "inputPortNames: uncaught excess arg names"
   saveMethodPortTypes _ modName _ result = primSavePortType modName result $ typeOf (_ :: a)
 
 {-

testsuite/bsc.verilog/splitports/TooManyArgNames.bs

@@ -0,0 +1,46 @@
+package TooManyArgNames where
+
+import SplitPorts
+import CShow
+
+struct Foo =
+  x :: Int 8
+  y :: Int 8
+ deriving (Bits)
+
+instance (ShallowSplitPorts Foo p) => SplitPorts Foo p where
+  splitPorts = shallowSplitPorts
+  unsplitPorts = shallowUnsplitPorts
+  portNames = shallowSplitPortNames
+
+struct Bar =
+  f :: Foo
+  b :: Bool
+ deriving (Bits)
+
+instance (ShallowSplitPorts Bar p) => SplitPorts Bar p where
+  splitPorts = shallowSplitPorts
+  unsplitPorts = shallowUnsplitPorts
+  portNames = shallowSplitPortNames
+
+interface SplitTest =
+  putFooBar :: Foo -> Bar -> Action {-# arg_names = ["fooIn1", "fooIn2", "fooIn3", "fooIn4"] #-}
+
+{-# synthesize mkTooManyArgNamesSplitTest #-}
+mkTooManyArgNamesSplitTest :: Module SplitTest
+mkTooManyArgNamesSplitTest =
+  module
+    interface
+      putFooBar x y = $display "putFooBar: " (cshow x) "  " (cshow y)
+
+{-# synthesize sysTooManyArgNames #-}
+sysTooManyArgNames :: Module Empty
+sysTooManyArgNames =
+  module
+    s <- mkTooManyArgNamesSplitTest
+    i :: Reg (UInt 8) <- mkReg 0
+    rules
+      when True ==> i := i + 1
+      when i == 0 ==> s.putFooBar (Foo { x = 5; y = 6; }) (Bar { f = Foo { x = 7; y = 8; }; b = True; })
+      when i == 1 ==> $finish
+

testsuite/bsc.verilog/splitports/TooManyArgNames.bs.bsc-vcomp-out.expected

@@ -0,0 +1,10 @@
+checking package dependencies
+compiling TooManyArgNames.bs
+code generation for mkTooManyArgNamesSplitTest starts
+Error: "TooManyArgNames.bs", line 27, column 29: (S0015)
+  Bluespec evaluation-time error: 2 excess arg_names provided for method
+  putFooBar
+  During elaboration of the interface method `putFooBar' at
+  "TooManyArgNames.bs", line 30, column 0.
+  During elaboration of `mkTooManyArgNamesSplitTest' at "TooManyArgNames.bs",
+  line 30, column 0.

testsuite/bsc.verilog/splitports/splitports.exp

@@ -39,6 +39,8 @@ if { $vtest == 1 } {
     find_regexp mkInstanceSplitTest.v {input  \[491 : 0\] putBaz_1_c;}
 }
 
+# Supplying an arg_names pragma that is shorter than the number of arguments
+# is currently supported:
 test_c_veri SomeArgNames
 if { $vtest == 1 } {
     find_regexp mkSomeArgNamesSplitTest.v {input  \[7 : 0\] putFooBar_fooIn_x;}
@@ -48,6 +50,9 @@ if { $vtest == 1 } {
     find_regexp mkSomeArgNamesSplitTest.v {input  putFooBar_2_b;}
 }
 
+compile_verilog_fail_error TooManyArgNames.bs S0015
+compare_file TooManyArgNames.bs.bsc-vcomp-out
+
 compile_verilog_fail_error PortNameConflict.bs G0055
 compare_file PortNameConflict.bs.bsc-vcomp-out