[Python-checkins] CVS: python/dist/src/Lib/dos-8x3 sre_comp.py,1.3,1.4 sre_pars.py,1.3,1.4

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Lib/dos-8x3
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19761

Modified Files:
	sre_comp.py sre_pars.py 
Log Message:
the usual

Index: sre_comp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/dos-8x3/sre_comp.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sre_comp.py	2000/06/30 16:13:37	1.3
--- sre_comp.py	2000/07/01 04:23:47	1.4
***************
*** 40,44 ****
              else:
                  emit(OPCODES[op])
! 		fixup = lambda x: x
              skip = len(code); emit(0)
              for op, av in av:
--- 40,44 ----
              else:
                  emit(OPCODES[op])
!                 fixup = lambda x: x
              skip = len(code); emit(0)
              for op, av in av:
***************
*** 119,123 ****
              emit(OPCODES[op])
              if flags & SRE_FLAG_MULTILINE:
!                 emit(ATCODES[AT_MULTILINE[av]])
              else:
                  emit(ATCODES[av])
--- 119,123 ----
              emit(OPCODES[op])
              if flags & SRE_FLAG_MULTILINE:
!                 emit(ATCODES[AT_MULTILINE.get(av, av)])
              else:
                  emit(ATCODES[av])
***************
*** 204,208 ****
          import sre_parse
          pattern = p
!         p = sre_parse.parse(p)
      else:
          pattern = None
--- 204,208 ----
          import sre_parse
          pattern = p
!         p = sre_parse.parse(p, flags)
      else:
          pattern = None

Index: sre_pars.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/dos-8x3/sre_pars.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sre_pars.py	2000/06/30 16:13:37	1.3
--- sre_pars.py	2000/07/01 04:23:47	1.4
***************
*** 20,25 ****
  MAXREPEAT = 32767
  
! # FIXME: same here
! CHARMASK = 0x7fff
  
  SPECIAL_CHARS = ".\\[{()*+?^$|"
--- 20,26 ----
  MAXREPEAT = 32767
  
! # FIXME: might change in 2.0 final.  but for now, this seems
! # to be the best way to be compatible with 1.5.2
! CHARMASK = 0xff
  
  SPECIAL_CHARS = ".\\[{()*+?^$|"
***************
*** 31,35 ****
  HEXDIGITS = tuple("0123456789abcdefABCDEF")
  
! WHITESPACE = string.whitespace
  
  ESCAPES = {
--- 32,36 ----
  HEXDIGITS = tuple("0123456789abcdefABCDEF")
  
! WHITESPACE = tuple(string.whitespace)
  
  ESCAPES = {
***************
*** 296,300 ****
      return subpattern
  
! def _parse(source, state, flags=0):
  
      # parse regular expression pattern into an operator list.
--- 297,301 ----
      return subpattern
  
! def _parse(source, state):
  
      # parse regular expression pattern into an operator list.
***************
*** 468,472 ****
                      b = []
                      while 1:
!                         p = _parse(source, state, flags)
                          if source.next == ")":
                              if b:
--- 469,473 ----
                      b = []
                      while 1:
!                         p = _parse(source, state)
                          if source.next == ")":
                              if b:
***************
*** 495,499 ****
                      group = state.getgroup(name)
                  while 1:
!                     p = _parse(source, state, flags)
                      if source.match(")"):
                          if b:
--- 496,500 ----
                      group = state.getgroup(name)
                  while 1:
!                     p = _parse(source, state)
                      if source.match(")"):
                          if b:
***************
*** 532,538 ****
      source = Tokenizer(pattern)
      state = State()
      b = []
      while 1:
!         p = _parse(source, state, flags)
          tail = source.get()
          if tail == "|":
--- 533,540 ----
      source = Tokenizer(pattern)
      state = State()
+     state.flags = flags
      b = []
      while 1:
!         p = _parse(source, state)
          tail = source.get()
          if tail == "|":
***************
*** 617,623 ****
      sep = match.string[:0]
      if type(sep) is type(""):
! 	char = chr
      else:
! 	char = unichr
      for c, s in template:
          if c is LITERAL:
--- 619,625 ----
      sep = match.string[:0]
      if type(sep) is type(""):
!         char = chr
      else:
!         char = unichr
      for c, s in template:
          if c is LITERAL: