From: Jan T. <de...@us...> - 2003-05-31 22:39:36
|
Update of /cvsroot/net-script/netscript2/src/perl/NetScript/Engine In directory sc8-pr-cvs1:/tmp/cvs-serv4485/NetScript/Engine Modified Files: BasicStatement.pm Class.pm ClassWrapper.pm DOMWalker.pm Event.pm EventListener.pm EventRelay.pm Function.pm FunctionWrapper.pm LibLoader.pm Member.pm MemberWrapper.pm State.pm Statement.pm StatementEvaluator.pm Log Message: * finished XSLT implementation Index: BasicStatement.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/BasicStatement.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BasicStatement.pm 29 May 2003 16:04:19 -0000 1.8 --- BasicStatement.pm 31 May 2003 22:39:33 -0000 1.9 *************** *** 5,9 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 5,9 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: Class.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/Class.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Class.pm 11 Jul 2002 22:03:09 -0000 1.6 --- Class.pm 31 May 2003 22:39:33 -0000 1.7 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: ClassWrapper.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/ClassWrapper.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClassWrapper.pm 7 Aug 2002 20:13:48 -0000 1.2 --- ClassWrapper.pm 31 May 2003 22:39:33 -0000 1.3 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: DOMWalker.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/DOMWalker.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DOMWalker.pm 29 May 2003 16:04:20 -0000 1.11 --- DOMWalker.pm 31 May 2003 22:39:33 -0000 1.12 *************** *** 5,9 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 5,9 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- *************** *** 217,220 **** --- 217,226 ---- if ( $this -> dal() -> isElementNode( $clone ) && $isRefNode ) { $this -> setCurrentTarget( $clone ) ; + + if ( $this -> { m_is_firstNode } ) { + $this -> dal() -> setDocumentElement( $this -> targetDocument(), + $clone ); + $this -> { m_is_firstNode } = 0; + } } $clone; *************** *** 260,263 **** --- 266,270 ---- # remove document element $this -> dal() -> removeChild( $document, $this -> dal() -> getDocumentElement( $document ) ); + $this -> { m_is_firstNode } = 1; $this -> setCurrentTarget( $document ); *************** *** 334,338 **** my ( $this ) = @_; my $target = $this -> currentTarget(); ! $this -> setCurrentTarget( $this -> dal() -> getParentNode( $target ) ); } --- 341,349 ---- my ( $this ) = @_; my $target = $this -> currentTarget(); ! my $parent = $this -> dal() -> getParentNode( $target ); ! if ( $parent == undef ) { ! $this -> { m_root_node } = $target; ! } ! $this -> setCurrentTarget( $parent ); } Index: Event.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/Event.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Event.pm 7 Jul 2002 14:34:31 -0000 1.7 --- Event.pm 31 May 2003 22:39:33 -0000 1.8 *************** *** 5,9 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 5,9 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: EventListener.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/EventListener.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EventListener.pm 2 Jun 2002 19:31:23 -0000 1.4 --- EventListener.pm 31 May 2003 22:39:33 -0000 1.5 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: EventRelay.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/EventRelay.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EventRelay.pm 2 Jun 2002 19:31:23 -0000 1.8 --- EventRelay.pm 31 May 2003 22:39:33 -0000 1.9 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: Function.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/Function.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Function.pm 7 Aug 2002 20:13:49 -0000 1.3 --- Function.pm 31 May 2003 22:39:33 -0000 1.4 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: FunctionWrapper.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/FunctionWrapper.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FunctionWrapper.pm 7 Aug 2002 20:13:49 -0000 1.2 --- FunctionWrapper.pm 31 May 2003 22:39:33 -0000 1.3 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: LibLoader.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/LibLoader.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LibLoader.pm 7 Jul 2002 14:34:31 -0000 1.2 --- LibLoader.pm 31 May 2003 22:39:33 -0000 1.3 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: Member.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/Member.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Member.pm 11 Jul 2002 22:03:09 -0000 1.2 --- Member.pm 31 May 2003 22:39:33 -0000 1.3 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: MemberWrapper.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/MemberWrapper.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MemberWrapper.pm 7 Aug 2002 20:13:49 -0000 1.3 --- MemberWrapper.pm 31 May 2003 22:39:33 -0000 1.4 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: State.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/State.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** State.pm 11 Jul 2002 22:03:09 -0000 1.7 --- State.pm 31 May 2003 22:39:33 -0000 1.8 *************** *** 7,11 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 7,11 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: Statement.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/Statement.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Statement.pm 15 May 2002 18:21:37 -0000 1.5 --- Statement.pm 31 May 2003 22:39:33 -0000 1.6 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- Index: StatementEvaluator.pm =================================================================== RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Engine/StatementEvaluator.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** StatementEvaluator.pm 18 Sep 2002 13:19:14 -0000 1.12 --- StatementEvaluator.pm 31 May 2003 22:39:33 -0000 1.13 *************** *** 4,8 **** # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomä, insOMnia # mailto: ko...@in... #-------------------------------------------------------- --- 4,8 ---- # NetScript and all related materials, such as documentation, # are protected under the terms and conditions of the Artistic License. ! # (C) 2000-2002 by Jan Thomae, insOMnia # mailto: ko...@in... #-------------------------------------------------------- *************** *** 67,71 **** # Quite hefty regexp. Does find the innermost pair parentheses which is not quoted. ! while ( $aString =~ /^(.*[^\\])\(((\\\(|\\\)|[^\(\)])*[^\\\)]?)?\)((\\\(|[^\(])*)$/ ) { # Search for the innermost pair of parentheses. my $pref = $1; # save string prefix --- 67,71 ---- # Quite hefty regexp. Does find the innermost pair parentheses which is not quoted. ! while ( $aString =~ /^(.*[^\\])\(((\\\(|\\\)|[^\(\)])*[^\\\)]?)?\)((\\\(|[^\(])*)$/sm ) { # Search for the innermost pair of parentheses. my $pref = $1; # save string prefix *************** *** 80,89 **** # lookup builtin functions ( format is $(name[parameter]) ) ! if ( $param =~ /^(.+) *\[(.*)\]$/ ) { $action = $1; $param = $2; } ! if ( $pref =~ /^(.*?[^\\]?)\$$/ ) { $pref = $1; --- 80,89 ---- # lookup builtin functions ( format is $(name[parameter]) ) ! if ( $param =~ /^(.+) *\[(.*)\]$/sm ) { $action = $1; $param = $2; } ! if ( $pref =~ /^(.*?[^\\]?)\$$/sm ) { $pref = $1; |