webmacro-cvs

[<bri...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv32064/src/org/webmacro/parser

Modified Files:
	WMParser.java 
Log Message:
More ripping out -- eliminate reference counting of Brokers, pooling of context and fastwriter; streamline Context; eliminate Clock thread hack; eliminate ascii fastwriter hack

Index: WMParser.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/parser/WMParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WMParser.java	12 Jun 2003 00:47:46 -0000	1.9
--- WMParser.java	16 Jul 2003 06:45:00 -0000	1.10
***************
*** 27,37 ****
  package org.webmacro.parser;
  
  import org.webmacro.Broker;
  import org.webmacro.engine.BlockBuilder;
  import org.webmacro.engine.Parser;
- import org.webmacro.util.ScalablePool;
- 
- import java.io.IOException;
- import java.io.Reader;
  
  public class WMParser implements Parser
--- 27,35 ----
  package org.webmacro.parser;
  
+ import java.io.*;
+ 
  import org.webmacro.Broker;
  import org.webmacro.engine.BlockBuilder;
  import org.webmacro.engine.Parser;
  
  public class WMParser implements Parser
***************
*** 39,43 ****
  
      private final Broker _broker;
-     private final ScalablePool _parserCache = new ScalablePool();
  
      public WMParser (Broker b)
--- 37,40 ----
***************
*** 47,51 ****
      }
  
- 
      // Parser Interface
  
--- 44,47 ----
***************
*** 72,80 ****
          try
          {
!             parser = (WMParser_impl) _parserCache.get();
!             if (parser != null)
!                 parser.ReInit(name, in);
!             else
!                 parser = new WMParser_impl(_broker, name, in);
  
              try
--- 68,72 ----
          try
          {
!             parser = new WMParser_impl(_broker, name, in);
  
              try
***************
*** 94,102 ****
          {
              throw new org.webmacro.engine.ParseException("Parse Exception", e);
-         }
-         finally
-         {
-             if (parser != null)
-                 _parserCache.put(parser);
          }
  
--- 86,89 ----