Index: src/org/javacc/parser/Options.java
===================================================================
RCS file: /cvs/javacc/src/org/javacc/parser/Options.java,v
retrieving revision 1.9
diff -r1.9 Options.java
53c53
<     protected static Map optionValues = null;
---
>     protected static Map<String, Object> optionValues;
59c59
<         return ((Integer) optionValues.get(option)).intValue();
---
>         return (Integer) optionValues.get(option);
66c66
<         return ((Boolean) optionValues.get(option)).booleanValue();
---
>         return (Boolean) optionValues.get(option);
81c81
<     private static Set cmdLineSetting = null;
---
>     private static Set<String> cmdLineSetting = null;
88c88
<     private static Set inputFileSetting = null;
---
>     private static Set<String> inputFileSetting;
94,100c94,100
<         optionValues = new HashMap();
<         cmdLineSetting = new HashSet();
<         inputFileSetting = new HashSet();
< 
<         optionValues.put("LOOKAHEAD", new Integer(1));
<         optionValues.put("CHOICE_AMBIGUITY_CHECK", new Integer(2));
<         optionValues.put("OTHER_AMBIGUITY_CHECK", new Integer(1));
---
>         optionValues = new HashMap<String, Object>();
>         cmdLineSetting = new HashSet<String>();
>         inputFileSetting = new HashSet<String>();
> 
>         optionValues.put("LOOKAHEAD", 1);
>         optionValues.put("CHOICE_AMBIGUITY_CHECK", 2);
>         optionValues.put("OTHER_AMBIGUITY_CHECK", 1);
159c159
<                 if (((Integer) Val).intValue() != value) {
---
>                 if ((Integer) Val != value) {
167c167
<         optionValues.put(s, new Integer(value));
---
>         optionValues.put(s, value);
193c193
<                 if (((Boolean) Val).booleanValue() != value) {
---
>                 if ((Boolean)Val != value) {
201c201
<         optionValues.put(s, (value ? Boolean.TRUE : Boolean.FALSE));
---
>         optionValues.put(s, value);
239,242d238
<     /**
<      * 
<      * @param arg
<      */
279c275
<                     Val = new Integer(i);
---
>                     Val = i;