Changeset 3919

Timestamp:

2003-03-19T14:57:06+12:00 (21 years ago)

Author:

jrm21

Message:

tidy and fix reg-exps when looking for #includes... it got stuck in a loop
in certain circumstances if "#include" was in there but not an actual
compiler statement...

File:

• trunk/gsdl/perllib/plugins/SRCPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/SRCPlug.pm

@@ -179 +179 @@
 
     # Get '#include' directives for metadata
-    if ($$textref =~ /\#\W?include\b/) {
-    my $includes=$$textref;
-
-    # remove commented lines
-    $includes =~ s@/\*.*?\*/@@sg; # treat string as single line
-    # ? means match smallest instead of longest !!!
-    $includes =~ s@//.*$@@mg; # treat string as multiple lines
-
-    # remove non- include lines (well, lines without a '#')
-    $includes =~ s/^[^\#]*$//mg;
-
-    # lines don't always start '#include "'.... we have to allow (eg)
-    # '#  include ...'
-    # '  #include ...'
-    # also make sure it contains an actual filename, as we don't
-    # do pre-processing (eg #including a macro).
-    while ($includes =~ /\#\s*include.*(\"|<)/) {
-        $includes =~ s/^.*?include.*?(\"|<)(.*)(\"|>).*$//m;
-        my $include=$2;
-        # remove leading pathname
-        $include =~ s@^.*(/|\\)@@;
-
-        my $incs_done=$doc_obj->get_metadata($section, "includes");
-        foreach my $elem (@$incs_done) {
-        if ("$elem" eq "$include") {goto header_done;}
-        }
-        $doc_obj->add_utf8_metadata($topsection, "includes", $include);
-      header_done:
+    if ($$textref !~ /\#\s*include\b/) {
+    return;
+    }
+
+    my @includes =
+    ($$textref =~ m/^\s*\#\s*include\s*(?:\"|<)(.*?)(?:\"|>)/mg);
+    
+    my $incs_done_ref=$doc_obj->get_metadata($section, "includes");
+    my @incs_done;
+    if (defined($incs_done_ref)) {
+    @incs_done=@$incs_done_ref;
+    } else {
+    @incs_done=();
+    }
+
+    foreach my $inc (@includes) {
+    # add entries, but only if they don't already exist
+    if (!join('', map {$_ eq "$inc"?1:""} @incs_done)) {
+        push @incs_done, $inc;
+        $doc_obj->add_utf8_metadata($topsection, "includes", $inc);
     }
     }