net-script-commits

[Jan T. <de...@us...>]

Update of /cvsroot/net-script/netscript2/src/perl/NetScript
In directory usw-pr-cvs1:/tmp/cvs-serv25787

Modified Files:
	Interpreter.pm 
Log Message:
* added the line number to the errror message, so errors can be tracked more easily

Index: Interpreter.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Interpreter.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Interpreter.pm	2 Jun 2002 19:31:23 -0000	1.8
--- Interpreter.pm	9 Jun 2002 12:51:11 -0000	1.9
***************
*** 149,153 ****
  
      # register the SYS-object
!     $this -> getState() -> setObjectValue( "SYS", $systemWrapper );
      
      return $this;                       # return Object
--- 149,153 ----
  
      # register the SYS-object
!     $this -> getState() -> createObjectValue( "SYS", $systemWrapper );
      
      return $this;                       # return Object
***************
*** 219,222 ****
--- 219,231 ----
  
  #/**
+ # Returns the DOMWalker walking over the base script.
+ # @public
+ #*/
+ sub getDOMWalker {
+     my ( $this )  = @_;
+     $this -> { m_DOMWalker };
+     }
+ 
+ #/**
  # Invokes the Interpreter. This will get the filename-parameter
  # from the CGI-Object, read configuration files, mappings and
***************
*** 254,261 ****
      # start input file parsing
      my $domparser = XML::DOM2::DOMParser -> new();
!     my $dom = $domparser -> parseString( { string => $scriptContent } );
  
     # Create a DOMWalker
      my $domwalker = NetScript::Engine::DOMWalker -> new( $this );
  
     # Walk over the DOM
--- 263,271 ----
      # start input file parsing
      my $domparser = XML::DOM2::DOMParser -> new();
!     my $dom = $domparser -> parseString( $scriptContent );
  
     # Create a DOMWalker
      my $domwalker = NetScript::Engine::DOMWalker -> new( $this );
+     $this -> { m_DOMWalker } = $domwalker;
  
     # Walk over the DOM
***************
*** 264,270 ****
      my $domwriter = XML::DOM2::DOMWriter -> new();
      my $domstyle = XML::DOM2::XMLDOMWriterStyle -> new();
!     my $string = $domwriter -> writeDOMToString( { 
!             document => $resultDOM,  
!             style => $domstyle } );
  
      my $cookiesRef = $this -> { m_Cookies };
--- 274,278 ----
      my $domwriter = XML::DOM2::DOMWriter -> new();
      my $domstyle = XML::DOM2::XMLDOMWriterStyle -> new();
!     my $string = $domwriter -> writeDOMToString( $resultDOM, $domstyle );
  
      my $cookiesRef = $this -> { m_Cookies };
***************
*** 373,377 ****
  sub onFatalEvent {
      my ($this, $event ) = @_;
!     die $event -> eventMessage();
      }
  
--- 381,387 ----
  sub onFatalEvent {
      my ($this, $event ) = @_;
!     my $line = $this -> getDOMWalker() -> currentSource() -> getLine();
!     die $event -> eventMessage().
!         "\n\nError occured in or around line $line in ".$this -> getScriptURL()."\n";
      }