Round GenNumMax; typecast reader crypt(0 attribute

Author: dwarring

coverage/PDF/IO/Crypt/AST.rakucov

@@ -1,6 +1,4 @@
-✱ use v6;
-  
-x unit role PDF::IO::Crypt::AST;
+* unit role PDF::IO::Crypt::AST;
 
 x method crypt {...}
 x method EncryptMetadata {...}
@@ -45,8 +43,8 @@ x                || (.key eq 'Metadata' && ! $.EncryptMetadata);
 * multi method crypt-ast('dict', SignatureDictLike $ast, |c) {
       # skip encryption of the /Contents entry of a Signature
       # dictionary, if it's a hex string.
-*     for $ast.pairs.sort {
-*         $.crypt-ast(.value, |c)
+x     for $ast.pairs.sort {
+x         $.crypt-ast(.value, |c)
               unless .key eq 'Contents' && .value ~~ :hex-string;
       }
   }

coverage/PDF/IO/Reader.rakucov

@@ -6,6 +6,7 @@
   use PDF::Grammar::PDF;
   use PDF::Grammar::PDF::Actions;
   use PDF::IO;
+  use PDF::IO::Crypt::PDF;
   use PDF::IO::IndObj;
   use PDF::IO::Serializer;
   use PDF::COS :IndRef, :IndObj;
@@ -17,7 +18,7 @@
   use JSON::Fast;
   use Method::Also;
 
-  constant GenNumMax = 65_536;
+  constant GenNumMax = 100_000;
 
   subset ObjNumInt of UInt;
   subset GenNumInt of Int where 0 <= * < GenNumMax;
@@ -32,7 +33,7 @@
   has uint64   $.prev;             #= xref offset
   has uint     $.size is rw;       #= /Size entry in trailer dict ~ first free object number
   has uint64   @.xrefs = (0);      #= xref position for each revision in the file
-  has $.crypt is rw;
+  has PDF::IO::Crypt::PDF $.crypt is rw;
   has Rat $.compat;        #= cross reference stream mode
 * method compat is rw {
 *     Proxy.new:
@@ -606,11 +607,11 @@ x             elsif $type == IndexType::External {
 
       my UInt @ends;
 ✱     my UInt $offset = $!prev;
-✱     my UInt %offsets-seen;
+✱     my UInt %visited;
 
 x     while $offset.defined {
 *         die "xref '/Prev' cycle detected in cross-reference tables: \@$offset"
-              if %offsets-seen{$offset}++;
+              if %visited{$offset}++;
 *         @!xrefs.unshift: $offset;
 *         $offset = self!load-xref-section: $offset, :@ends;
       }

lib/PDF/IO/Reader.rakumod

@@ -6,6 +6,7 @@ use PDF::Grammar::COS;
 use PDF::Grammar::PDF;
 use PDF::Grammar::PDF::Actions;
 use PDF::IO;
+use PDF::IO::Crypt::PDF;
 use PDF::IO::IndObj;
 use PDF::IO::Serializer;
 use PDF::COS :IndRef, :IndObj;
@@ -17,7 +18,7 @@ use Hash::int;
 use JSON::Fast;
 use Method::Also;
 
-constant GenNumMax = 65_536;
+constant GenNumMax = 100_000;
 
 subset ObjNumInt of UInt;
 subset GenNumInt of Int where 0 <= * < GenNumMax;
@@ -32,7 +33,7 @@ has Str      $.type is rw;       #= 'PDF', 'FDF', etc...
 has uint64   $.prev;             #= xref offset
 has uint     $.size is rw;       #= /Size entry in trailer dict ~ first free object number
 has uint64   @.xrefs = (0);      #= xref position for each revision in the file
-has $.crypt is rw;
+has PDF::IO::Crypt::PDF $.crypt is rw;
 has Rat $.compat;        #= cross reference stream mode
 method compat is rw {
     Proxy.new:
@@ -606,11 +607,11 @@ method !load-xrefs($grammar, $actions, |c) {
 
     my UInt @ends;
     my UInt $offset = $!prev;
-    my UInt %offsets-seen;
+    my UInt %visited;
 
     while $offset.defined {
         die "xref '/Prev' cycle detected in cross-reference tables: \@$offset"
-            if %offsets-seen{$offset}++;
+            if %visited{$offset}++;
         @!xrefs.unshift: $offset;
         $offset = self!load-xref-section: $offset, :@ends;
     }