ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/ActiveDoc/SimpleDoc.pm
(Generate patch)

Comparing COMP/SCRAM/src/ActiveDoc/SimpleDoc.pm (file contents):
Revision 1.2 by williamc, Fri Apr 7 13:40:10 2000 UTC vs.
Revision 1.3 by williamc, Mon Aug 28 07:43:21 2000 UTC

# Line 9 | Line 9
9   #
10   # Interface
11   # ---------
12 < # new()         : A new ActiveDoc object
12 > # new([DocVersionTag])          : A new ActiveDoc object. You can also
13 > #                                 specify an alternative doc version tag
14   # filetoparse([filename])       : Set/Return the filename of document
15   # newparse(parselabel) : Create a new parse type
16   # parse(parselabel)    : Parse the document file for the given parse level
17 < # addtag(parselabel,tagname,start,obj,text,obj,end,obj) :
17 > # addtag(parselabel,tagname,start,obj,[text,obj,end,obj]) :
18   #                                Add tags to the parse given by label
19   # grouptag(tagname, parselabel) : Allow a tag to switch context
20   #                                 - if not you can never turn a context off!
# Line 31 | Line 32
32   # allowgroup(name,parse) : allow a group so named
33   # disallowgroup(name,parse) : disallow the named group
34   # restoregroup(name,parse) : restore group access setting (that before last change)
35 + # doctype()             : return the (type,version) of the document
36 + #                         as specified by the DocVersionTag
37 + # filenameref(string)   : A string to refer to the file in parse error messages
38 + #                         etc. Default is filetoparse
39   # --------------- Error handling routines ---------------
40   # verbose(string)       : Print string in verbosity mode
41   # verbosity(0|1)        : verbosity off|on
# Line 48 | Line 53 | sub new {
53          my $class=shift;
54          $self={};
55          bless $self, $class;
56 <        $self->verbose("New SimpleDoc (".ref($self).") Created");
52 <        $self->init(@_);
56 >        $self->_initdoc("doc",@_);
57          return $self;
58   }
59  
60 < sub init {
61 <        # dummy to be overridden by inheriting class
60 > sub doctype {
61 >        my $self=shift;
62 >        my $rv=1;
63 >
64 >        undef $self->{docversion};
65 >        undef $self->{doctype};
66 >        $self->parse("doc");
67 >        return ($self->{doctype},$self->{docversion});
68 > }
69 >
70 > sub filenameref {
71 >        my $self=shift;
72 >        if ( @_ ) {
73 >           $self->{filenameref}=shift;
74 >        }
75 >        return (defined $self->{filenameref})?$self->{filenameref}
76 >                                             :$self->filetoparse();
77 > }
78 >
79 > sub _initdoc {
80 >        my $self=shift;
81 >        my $parsename=shift;
82 >
83 >        $self->{doctag}="DOC";
84 >        if ( @_ ) {
85 >          $self->{doctag}=shift;
86 >        }
87 >        $self->newparse($parsename);
88 >        $self->addtag($parsename,$self->{doctag},\&Doc_Start, $self);
89   }
90  
91   sub verbosity {
# Line 77 | Line 108 | sub parse {
108          $parselabel=shift;
109  
110          my $file=$self->filetoparse();
111 <        if ( $file ) {
111 >        if ( -f $file ) {
112            if ( exists $self->{parsers}{$parselabel} ) {
113              $self->verbose("Parsing $parselabel in file $file");
114              $self->{currentparsename}=$parselabel;
# Line 89 | Line 120 | sub parse {
120            }
121          }
122          else {
123 <          $self->error("Cannot parse $parselabel - file not known");
123 >          $self->error("Cannot parse \"$parselabel\" - file $file not known");
124          }
125   }
126  
# Line 149 | Line 180 | sub includeparse {
180   sub addtag {
181          my $self=shift;
182          my $parselabel=shift;
183 <        if ( $#_ != 6 ) {
183 >        if ( ( $#_ != 6 ) && ( $#_ != 2) ) {
184                  $self->error("Incorrect addtags specification\n".
185                                  "called with :\n@_ \n");
186          }
# Line 229 | Line 260 | sub parseerror {
260          my $string=shift;
261  
262          if ( $self->currentparsename() eq "" ) {
263 <                $self->error($string);
263 >                $self->error("Error In file ".$self->filenameref."\n".$string);
264          }
265          else {
266           $line=$self->line();
267 <         print "Parse Error in ".$self->filetoparse().", line ".
267 >         print "Parse Error in ".$self->filenameref().", line ".
268                                          $line."\n";
269           print $string."\n";
270           exit;
# Line 261 | Line 292 | sub tagstartline {
292          return $self->{currentparser}->tagstartline();
293   }
294  
295 + # -- tag routines
296 + sub Doc_Start {
297 +        my $self=shift;
298 +        my $name=shift;
299 +        my $hashref=shift;
300 +
301 +        $self->checktag($name, $hashref, "type");
302 +        $self->checktag($name, $hashref, "version");
303 +
304 +        $self->{doctype}=$$hashref{'type'};
305 +        $self->{docversion}=$$hashref{'version'};
306 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines