[Nice-commit] Nice/stdlib/nice/getopt getopt.nice,1.22,1.23

[Arjan B. <ar...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/getopt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27720/F:/nice/stdlib/nice/getopt

Modified Files:
	getopt.nice 
Log Message:
Removed usage of old pattern syntax.

Index: getopt.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/getopt/getopt.nice,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** getopt.nice	21 May 2004 17:01:08 -0000	1.22
--- getopt.nice	29 Jul 2004 12:36:13 -0000	1.23
***************
*** 9,22 ****
  
  int optType(Option);
! optType(o@NoParamOption) = NO_ARGUMENT;
! optType(o@ParamOption) = REQUIRED_ARGUMENT;
! optType(o@OptionalParamOption) = OPTIONAL_ARGUMENT;
  
  String optSuffix(Option);
! optSuffix(o@NoParamOption) = "";
! optSuffix(o@ParamOption) = ":";
! optSuffix(o@OptionalParamOption) = "::";
  
! parse(progName@String, args, options)
  {
    List<LongOpt> longOptions = new ArrayList(options.length);
--- 9,22 ----
  
  int optType(Option);
! optType(NoParamOption o) = NO_ARGUMENT;
! optType(ParamOption o) = REQUIRED_ARGUMENT;
! optType(OptionalParamOption o) = OPTIONAL_ARGUMENT;
  
  String optSuffix(Option);
! optSuffix(NoParamOption o) = "";
! optSuffix(ParamOption o) = ":";
! optSuffix(OptionalParamOption o) = "::";
  
! parse(String progName, args, options)
  {
    List<LongOpt> longOptions = new ArrayList(options.length);
***************
*** 68,74 ****
  
  void doAction(Option, Getopt);
! doAction(o@NoParamOption,g) = action(o)();
! doAction(o@ParamOption,g) = actionParam(o)(notNull(g.getOptarg()));
! doAction(o@OptionalParamOption,g)
  {
  
--- 68,74 ----
  
  void doAction(Option, Getopt);
! doAction(NoParamOption o, g) = action(o)();
! doAction(ParamOption o, g) = actionParam(o)(notNull(g.getOptarg()));
! doAction(OptionalParamOption o, g)
  {
  
***************
*** 119,125 ****
  
  String paramString(Option);
! paramString(@NoParamOption) = "";
! paramString(o@ParamOption) = " " + o.optionHint.toUpperCase();
! paramString(o@OptionalParamOption) = "[=" + o.optionHint.toUpperCase() + "]";
  
  String pad(String s, int len, char c)
--- 119,125 ----
  
  String paramString(Option);
! paramString(NoParamOption o) = "";
! paramString(ParamOption o) = " " + o.optionHint.toUpperCase();
! paramString(OptionalParamOption o) = "[=" + o.optionHint.toUpperCase() + "]";
  
  String pad(String s, int len, char c)