webmacro-cvs — receive cvs commit messages

[WebMacro-cvs] webmacro/src/org/webmacro/directive ForeachDirective.java,1.15,1.16

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv5401/src/org/webmacro/directive

Modified Files:
	ForeachDirective.java 
Log Message:
clean up the "blah is not a list" warning message generated by #foreach to include the $VariableName, the context location, and the class type of the object that isn't a list.


Index: ForeachDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/ForeachDirective.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ForeachDirective.java	11 Jun 2002 17:43:20 -0000	1.15
--- ForeachDirective.java	31 Oct 2002 17:34:03 -0000	1.16
***************
*** 134,141 ****
        try {
           iter = context.getBroker()._propertyOperators.getIterator(l);
!       }
!       catch (Exception e) {
!          String warning = "#foreach: list argument is not a list: " + l;
!          context.getLog("engine").warning(warning + "; " + e);
           writeWarning(warning, context, out);
           return;
--- 134,146 ----
        try {
           iter = context.getBroker()._propertyOperators.getIterator(l);
!       } catch (Exception e) {
!          String warning = "#foreach: ";
!          if (list instanceof Variable)
!              warning += "$" + ((Variable) list).getVariableName();
!          else
!             warning += list;
! 
!          warning += ": " + e.getMessage() + " at " + context.getCurrentLocation();
!          context.getLog("engine").warning(warning);
           writeWarning(warning, context, out);
           return;

[WebMacro-cvs] webmacro/src/org/webmacro/engine PropertyOperatorCache.java,1.14,1.15

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/engine
In directory usw-pr-cvs1:/tmp/cvs-serv5401/src/org/webmacro/engine

Modified Files:
	PropertyOperatorCache.java 
Log Message:
clean up the "blah is not a list" warning message generated by #foreach to include the $VariableName, the context location, and the class type of the object that isn't a list.


Index: PropertyOperatorCache.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/engine/PropertyOperatorCache.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PropertyOperatorCache.java	5 Jul 2002 02:47:15 -0000	1.14
--- PropertyOperatorCache.java	31 Oct 2002 17:34:04 -0000	1.15
***************
*** 850,854 ****
           }
        }
!       throw new PropertyException(instance + " is not a list", null);
     }
  
--- 850,854 ----
           }
        }
!       throw new PropertyException((instance==null ? "null" : instance.getClass().getName()) + " is not a list");
     }
  

[WebMacro-cvs] wiki/src/org/tcdi/opensource/wiki/parser WikiParserTokenManager.java,1.2,1.3 wiki.jj,1.5,1.6

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser
In directory usw-pr-cvs1:/tmp/cvs-serv8442/src/org/tcdi/opensource/wiki/parser

Modified Files:
	WikiParserTokenManager.java wiki.jj 
Log Message:
Turn on UNICODE_INPUT in the Wiki parser.  No telling what problems this may cause, but it does fix a number of encoding problems we've been having here at TCDI.


Index: WikiParserTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/WikiParserTokenManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WikiParserTokenManager.java	5 Dec 2001 21:01:58 -0000	1.2
--- WikiParserTokenManager.java	24 Oct 2002 16:23:37 -0000	1.3
***************
*** 292,295 ****
--- 292,298 ----
  }
  static final long[] jjbitVec0 = {
+    0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
+ };
+ static final long[] jjbitVec2 = {
     0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
  };
***************
*** 750,753 ****
--- 753,759 ----
        else
        {
+          int hiByte = (int)(curChar >> 8);
+          int i1 = hiByte >> 6;
+          long l1 = 1L << (hiByte & 077);
           int i2 = (curChar & 0xff) >> 6;
           long l2 = 1L << (curChar & 077);
***************
*** 757,782 ****
              {
                 case 7:
!                   if ((jjbitVec0[i2] & l2) != 0L && kind > 32)
                       kind = 32;
                    break;
                 case 49:
                 case 1:
!                   if ((jjbitVec0[i2] & l2) != 0L)
                       jjCheckNAddStates(11, 13);
                    break;
                 case 48:
!                   if ((jjbitVec0[i2] & l2) != 0L)
                       jjCheckNAddStates(11, 13);
                    break;
                 case 3:
!                   if ((jjbitVec0[i2] & l2) != 0L)
                       jjCheckNAddStates(14, 16);
                    break;
                 case 6:
!                   if ((jjbitVec0[i2] & l2) != 0L)
                       jjCheckNAddStates(17, 20);
                    break;
                 case 30:
!                   if ((jjbitVec0[i2] & l2) != 0L)
                       jjAddStates(37, 38);
                    break;
--- 763,788 ----
              {
                 case 7:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 32)
                       kind = 32;
                    break;
                 case 49:
                 case 1:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                       jjCheckNAddStates(11, 13);
                    break;
                 case 48:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                       jjCheckNAddStates(11, 13);
                    break;
                 case 3:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                       jjCheckNAddStates(14, 16);
                    break;
                 case 6:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                       jjCheckNAddStates(17, 20);
                    break;
                 case 30:
!                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                       jjAddStates(37, 38);
                    break;
***************
*** 803,806 ****
--- 809,824 ----
     40, 37, 38, 39, 40, 30, 31, 
  };
+ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
+ {
+    switch(hiByte)
+    {
+       case 0:
+          return ((jjbitVec2[i2] & l2) != 0L);
+       default : 
+          if ((jjbitVec0[i1] & l1) != 0L)
+             return true;
+          return false;
+    }
+ }
  public static final String[] jjstrLiteralImages = {
  "", null, null, null, null, null, null, null, null, null, "\52", "\137", 

Index: wiki.jj
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/wiki.jj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wiki.jj	5 Jan 2002 19:51:09 -0000	1.5
--- wiki.jj	24 Oct 2002 16:23:38 -0000	1.6
***************
*** 1,3 ****
! options { STATIC = false; USER_CHAR_STREAM = false; }
  
  PARSER_BEGIN(WikiParser)
--- 1,3 ----
! options { STATIC = false; USER_CHAR_STREAM = false; UNICODE_INPUT = true; }
  
  PARSER_BEGIN(WikiParser)

[WebMacro-cvs] webmacro/src/org/webmacro/directive CountDirective.java,1.1,1.2

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv27188/src/org/webmacro/directive

Modified Files:
	CountDirective.java 
Log Message:
I must have just learned to program yesterday.  fix the #count directive to count correctly.


Index: CountDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/CountDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CountDirective.java	22 Oct 2002 15:23:17 -0000	1.1
--- CountDirective.java	25 Oct 2002 01:41:05 -0000	1.2
***************
*** 131,145 ****
          }
  
-         // negate the step, if necessary
-         if ((start > end && step > 0) || (start < end && step < 0))
-             step = -step;
- 
          // just do it
!         for (; ; start+=step) {
              _iterator.setValue(context, new Integer(start));
              _body.write(out, context);
- 
-             if (start==end)
-                 break;
          }
      }
--- 131,138 ----
          }
  
          // just do it
!         for (; start<=end; start+=step) {
              _iterator.setValue(context, new Integer(start));
              _body.write(out, context);
          }
      }

[WebMacro-cvs] webmacro WebMacro.defaults,1.31,1.32

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv5949

Modified Files:
	WebMacro.defaults 
Log Message:
adding and configuring in the new #count directive.  still need to write javadocs for it.


Index: WebMacro.defaults
===================================================================
RCS file: /cvsroot/webmacro/webmacro/WebMacro.defaults,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** WebMacro.defaults	17 Jun 2002 03:07:46 -0000	1.31
--- WebMacro.defaults	22 Oct 2002 15:23:16 -0000	1.32
***************
*** 210,213 ****
--- 210,214 ----
  Directives.type:       org.webmacro.directive.TypeDirective
  Directives.default:    org.webmacro.directive.DefaultDirective
+ Directives.count:      org.webmacro.directive.CountDirective
  
  

[WebMacro-cvs] webmacro/src/org/webmacro/directive CountDirective.java,NONE,1.1

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory usw-pr-cvs1:/tmp/cvs-serv5949/src/org/webmacro/directive

Added Files:
	CountDirective.java 
Log Message:
adding and configuring in the new #count directive.  still need to write javadocs for it.


--- NEW FILE: CountDirective.java ---
/*
 * Created by IntelliJ IDEA.
 * User: e_ridge
 * Date: Oct 18, 2002
 * Time: 4:44:50 PM
 * To change template for new class use
 * Code Style | Class Templates options (Tools | IDE Options).
 */
package org.webmacro.directive;

import org.webmacro.directive.*;
import org.webmacro.engine.*;
import org.webmacro.*;

import java.io.IOException;

/**
 * #count $i from 1 to 100 [step 1]
 */
public class CountDirective extends org.webmacro.directive.Directive {

    private static final int COUNT_ITERATOR = 1;
    private static final int COUNT_FROM_K = 2;
    private static final int COUNT_START = 3;
    private static final int COUNT_TO_K = 4;
    private static final int COUNT_END = 5;
    private static final int COUNT_STEP_K = 6;
    private static final int COUNT_STEP = 7;
    private static final int COUNT_BODY = 8;

    private static final Directive.ArgDescriptor[] _args = new Directive.ArgDescriptor[]{
        new Directive.LValueArg(COUNT_ITERATOR),
        new Directive.KeywordArg(COUNT_FROM_K, "from"),
        new Directive.RValueArg(COUNT_START),
        new Directive.KeywordArg(COUNT_TO_K, "to"),
        new Directive.RValueArg(COUNT_END),
        new Directive.OptionalGroup(2),
        new Directive.KeywordArg(COUNT_STEP_K, "step"),
        new Directive.RValueArg(COUNT_STEP),
        new Directive.BlockArg(COUNT_BODY),
    };

    private static final DirectiveDescriptor _desc = new DirectiveDescriptor("for", null, _args, null);

    public static DirectiveDescriptor getDescriptor() {
        return _desc;
    }

    private Variable _iterator;
    private Macro _body;
    private Object _objStart;
    private Object _objEnd;
    private Object _objStep;

    private int _start, _end, _step = 1;

    public Object build(DirectiveBuilder builder, BuildContext bc) throws BuildException {
        try {
            _iterator = (Variable) builder.getArg(COUNT_ITERATOR, bc);
        } catch (ClassCastException e) {
            throw new Directive.NotVariableBuildException(_desc.name, e);
        }
        _objStart = builder.getArg(COUNT_START, bc);
        _objEnd = builder.getArg(COUNT_END, bc);
        _objStep = builder.getArg(COUNT_STEP, bc);
        _body = (Block) builder.getArg(COUNT_BODY, bc);

        // attempt to go ahead and force the start, end, and step values into primitive ints
        if (_objStart != null) {
            if (_objStart instanceof Number) {
                _start = ((Number) _objStart).intValue();
                _objStart = null;
            } else if (_objStart instanceof String) {
                _start = Integer.parseInt((String) _objStart);
                _objStart = null;
            }
        }
        if (_objEnd != null) {
            if (_objEnd instanceof Number) {
                _end = ((Number) _objEnd).intValue();
                _objEnd = null;
            } else if (_objEnd instanceof String) {
                _end = Integer.parseInt((String) _objEnd);
                _objEnd = null;
            }
        }
        if (_objStep != null) {
            if (_objStep instanceof Number) {
                _step = ((Number) _objStep).intValue();
                _objStep = null;
            } else if (_objStep instanceof String) {
                _step = Integer.parseInt((String) _objStep);
                _objStep = null;
            }
        }

        return this;
    }

    public void write(FastWriter out, Context context) throws PropertyException, IOException {
        int start=_start, end=_end, step = _step;
        Object tmp;

        // if necessary, do run-time evaluation of our
        // start, end, and step objects.
        if ( (tmp = _objStart) != null) {
            while (tmp instanceof Macro)
                tmp = ((Macro) tmp).evaluate(context);
            if (tmp != null)
                start = Integer.parseInt(tmp.toString());
            else
                throw new PropertyException ("Starting value cannot be null");
        }

        if ( (tmp = _objEnd) != null) {
            while (tmp instanceof Macro)
                tmp = ((Macro) tmp).evaluate(context);
            if (tmp != null)
                end = Integer.parseInt(tmp.toString());
            else
                throw new PropertyException ("Ending value cannot be null");
        }

        if ( (tmp = _objStep) != null) {
            while (tmp instanceof Macro)
                tmp = ((Macro) tmp).evaluate(context);
            if (tmp != null)
                step = Integer.parseInt(tmp.toString());
            else
                throw new PropertyException ("Step value cannot be null");
        }

        // negate the step, if necessary
        if ((start > end && step > 0) || (start < end && step < 0))
            step = -step;

        // just do it
        for (; ; start+=step) {
            _iterator.setValue(context, new Integer(start));
            _body.write(out, context);

            if (start==end)
                break;
        }
    }
}

[WebMacro-cvs] wiki/builds/www.webmacro.org/templates optionsbar.wm,1.1,1.2

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates
In directory usw-pr-cvs1:/tmp/cvs-serv30375

Modified Files:
	optionsbar.wm 
Log Message:
fix the CVS link to point to our repository on SourceForge


Index: optionsbar.wm
===================================================================
RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/optionsbar.wm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** optionsbar.wm	15 Oct 2001 06:36:20 -0000	1.1
--- optionsbar.wm	19 Oct 2002 19:56:13 -0000	1.2
***************
*** 21,25 ****
        <a href="SiteMap"><span class="NavigationLinks">Site Map</span></a>
         || <a href="http://www.webmacro.org/bugzilla/"><span class="NavigationLinks">Bugzilla</span></a>
!        || <a href="http://www.webmacro.org/cvs/"><span class="NavigationLinks">CVS</span></a>
     </td>
     
--- 21,25 ----
        <a href="SiteMap"><span class="NavigationLinks">Site Map</span></a>
         || <a href="http://www.webmacro.org/bugzilla/"><span class="NavigationLinks">Bugzilla</span></a>
!        || <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/webmacro/"><span class="NavigationLinks">CVS</span></a>
     </td>
     

[WebMacro-cvs] webmacro test.txt,1.10,NONE

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv26059

Removed Files:
	test.txt 
Log Message:
looks like syncmail really works.  removing this test file


--- test.txt DELETED ---

[WebMacro-cvs] webmacro test.txt,1.9,1.10

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv19643

Modified Files:
	test.txt 
Log Message:
more testing


Index: test.txt
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test.txt	19 Oct 2002 19:19:49 -0000	1.9
--- test.txt	19 Oct 2002 19:21:42 -0000	1.10
***************
*** 1 ****
! this is just a test
--- 1 ----
! blah blah blahthis is just a test

[WebMacro-cvs] webmacro test.txt,1.8,1.9

[<dr...@us...>]

Update of /cvsroot/webmacro/webmacro
In directory usw-pr-cvs1:/tmp/cvs-serv18743

Added Files:
	test.txt 
Log Message:
testing to see if syncmail actually works

[WebMacro-cvs] testing

[Eric B. R. <eb...@tc...>]

eric