refactor ind-ref() method

Author: dwarring

lib/PDF/COS/Tie.rakumod

@@ -7,12 +7,11 @@ my constant $Lock = Lock.new;
 #| generate an indirect reference to ourselves
 method ind-ref returns IndRef {
     given $.obj-num {
-        $_
-            ?? ($_ < 0
-                ?? die "indirect object has not been allocated"
-                !! :ind-ref[ $_, $.gen-num ]
-               )
-            !! die "not an indirect object";
+        die "not an indirect object" unless .so;
+        die "indirect object has not been allocated"
+            if $_ < 0; 
+
+        :ind-ref[ $_, $.gen-num ]
     }
 }
 
@@ -131,11 +130,6 @@ my class COSAttr {
             || ($!type ~~ Associative[Mu] && $lval ~~ Hash) {
                 self!tie-container: $lval, :$check;
             }
-            elsif $lval.isa(array) && $!type ~~ Positional[Numeric] {
-                # assume numeric. not so easy to type-check atm
-                # https://github.com/rakudo/rakudo/issues/4485
-                # update: fixed as of Rakudo 2021.08
-            }
             else {
                 my \of-type = $!decont ?? $!type.of !! $!type;
                 unless $lval ~~ of-type {
@@ -151,7 +145,8 @@ my class COSAttr {
         }
         $lval;
     }
-    multi method tie($lval is rw, :$check) is rw {
+
+    multi method tie($lval is rw, :check($)) is rw {
         $Lock.protect: {
             $lval.obj-num //= -1
         } if $.is-indirect && $lval ~~ PDF::COS;

t/indobj-array.t

@@ -51,6 +51,6 @@ $cs[1] = { :WhitePoint[1.0, 1.0, 1.0] };
 is $cs.Subtype, 'Lab', 'tied index [0]';
 is-json-equiv $cs.Dict, { :WhitePoint[1.0, 1.0, 1.0] }, 'tied index [1]';
 ok $cs.Dict ~~ ColorSpaceDict, 'tied index "does" attribute';
-is $cs.Dict.yay, 42, 'tied index "does" attribute';
+is $cs.Dict.yay, 42, 'tied index method call';
 lives-ok {$cs.Subtype = 'CalRGB'}, 'tied index assignment';
 is $cs.Subtype, 'CalRGB', 'tied index fetch';

t/indobj-dict.t

@@ -31,12 +31,13 @@ ind-obj-tests(
     );
 
 ind-obj-tests(
-    :ind-obj[29, 0, :dict{ P => :ind-ref[142, 0],
-                           S => :name<Link>,
-                           K => :array[ :ind-ref[207, 0],
-                                        :dict{Type => :name<OBJR>,
-                                              Pg => :ind-ref[216, 0],
-                                              Obj => :ind-ref[233, 0]},
+    :ind-obj[29, 0,
+             :dict{ P => :ind-ref[142, 0],
+                    S => :name<Link>,
+                    K => :array[ :ind-ref[207, 0],
+                                 :dict{ Type => :name<OBJR>,
+                                        Pg => :ind-ref[216, 0],
+                                        Obj => :ind-ref[233, 0]},
                                ]},
     ],
     :class(PDF::COS::Dict),
@@ -47,7 +48,7 @@ ind-obj-tests(
                     :Pg{ :ind-ref[ 216, 0 ] },
                     :Obj{ :ind-ref[ 233, 0 ] },
                   }
-                  ] },
+                ] },
     );
 
 use PDF::COS::Tie;