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

Comparing COMP/SCRAM/src/BuildSystem/BuildFile.pm (file contents):
Revision 1.1.2.2 by williamc, Mon Apr 10 08:47:03 2000 UTC vs.
Revision 1.1.2.3 by williamc, Mon Apr 10 13:52:33 2000 UTC

# Line 50 | Line 50 | sub _initswitcher {
50          $switch->addtag($parse,"LibType",
51                                          \&LibType_Start,$self,
52                                          \&LibType_text, $self,
53 <                                        "",$self);
53 >                                        \&LibType_end,$self);
54          $switch->addtag($parse,"ConfigurationClass",
55                                          \&Class_StartTag,$self,
56                                          \&OutToMakefile, $self,
# Line 642 | Line 642 | sub LibType_Start {
642          my $hashref=shift;
643  
644          if ( $self->{Arch} ) {
645 +        if ( defined $self->{libtype_conext} ) {
646 +          $self->{switch}->parseerror("<$name> tag cannot be specified".
647 +                " without a </$name> tag to close previous context");
648 +        }
649 +        else {
650 +        $self->{libtype_conext}=1;
651          $self->{switch}->checktag($name, $hashref, 'type');
652          
653          print GNUmakefile "# Specify Library Type\n";
# Line 660 | Line 666 | sub LibType_Start {
666          }
667          print GNUmakefile "\n";
668          }
669 +        }
670   }
671 +
672   sub LibType_text {
673          my $self=shift;
674          my $name=shift;
# Line 674 | Line 682 | sub LibType_text {
682          }
683   }
684  
685 + sub LibType_end {
686 +        my $self=shift;
687 +        my $name=shift;
688 +
689 +        undef $self->{libtype_conext};
690 + }
691 +
692   sub Environment_start {
693          my $self=shift;
694          my $name=shift;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines