Convert to unit classes

pdf-raku · Aug 9, 2024 · 23e2217 · 23e2217
1 parent 4dc59b0
commit 23e2217
Show file tree

Hide file tree

Showing 10 changed files with 747 additions and 749 deletions.
diff --git a/lib/PDF/Tags.rakumod b/lib/PDF/Tags.rakumod
@@ -60,10 +60,10 @@ class PDF::Tags:ver<0.1.16> {
                 my ($owner, $key) = att-owner(.key);
                 %atts-by-owner{$owner}{$key} = .value;
             }
-            my @atts = %atts-by-owner.keys.sort.map: -> $owner {
+            my PDF::Attributes() @atts = %atts-by-owner.keys.sort.map: -> $owner {
                 my %atts = %atts-by-owner{$owner};
                 %atts<O> = $owner;
-                PDF::Attributes.COERCE: %atts
+                %atts;
             }
 
             if @atts {
@@ -79,7 +79,7 @@ class PDF::Tags:ver<0.1.16> {
     }
 
     method create(
-        PDF::Class:D :$pdf,
+        PDF::Class:D :$pdf!,
         PDF::StructTreeRoot() :$cos = { :Type( :name<StructTreeRoot> )},
         :%role-map,
         :%class-map,

diff --git a/lib/PDF/Tags/Attr.rakumod b/lib/PDF/Tags/Attr.rakumod
@@ -1,27 +1,29 @@
-use PDF::Tags::Node;
 #| Attribute node
-class PDF::Tags::Attr
-    is PDF::Tags::Node {
-    use PDF::Tags::Node::Parent;
-    use Method::Also;
-
-    has PDF::Tags::Node::Parent $.parent is rw;
-    submethod TWEAK(Pair :$cos!) {
-        self.set-cos($cos);
-    }
-    method xpath {
-        my Str $xpath = .xpath  with $!parent;
-        $xpath ~= '@' ~ self.name;
-        $xpath;
-    }
-    multi sub to-str(@a) { @a».Str.join: ' '}
-    multi sub to-str($_) { .Str}
-    method name { $.cos.key }
-    method value { $.cos.value }
-    method text is also<Str> { to-str($.value) }
-    method gist { [~] '@', $.cos.key, '=', $.text }
-    method cos(--> Pair) is also<kv> { callsame() }
+unit class PDF::Tags::Attr;
+
+use PDF::Tags::Node;
+also is PDF::Tags::Node;
+
+use PDF::Tags::Node::Parent;
+use Method::Also;
+
+has PDF::Tags::Node::Parent $.parent is rw;
+submethod TWEAK(Pair :$cos!) {
+    self.set-cos($cos);
+}
+method xpath {
+    my Str $xpath = .xpath  with $!parent;
+    $xpath ~= '@' ~ self.name;
+    $xpath;
 }
+multi sub to-str(@a) { @a».Str.join: ' '}
+multi sub to-str($_) { .Str}
+method name { $.cos.key }
+method value { $.cos.value }
+method text is also<Str> { to-str($.value) }
+method gist { [~] '@', $.cos.key, '=', $.text }
+method cos(--> Pair) is also<kv> { callsame() }
+
 
 =begin pod