comparison src/regex.c @ 35525:95c2eedea354

(mutually_exclusive_p): Don't blindly handle `charset_not' as if it was a `charset'.

35524:91c357a883aa

    case endline:
    case exactn:
      {
	register re_wchar_t c
	  = (re_opcode_t) *p2 == endline ? '\n'
	  : RE_STRING_CHAR(p2 + 2, pend - p2 - 2);

	if ((re_opcode_t) *p1 == exactn)
	  {
	    if (c != RE_STRING_CHAR (p1 + 2, pend - p1 - 2))
	      {

	  }
      }
      break;

    case charset:
    case charset_not:
      {
	if ((re_opcode_t) *p1 == exactn)
	  /* Reuse the code above.  */
	  return mutually_exclusive_p (bufp, p2, p1);


      /* It is hard to list up all the character in charset
	 P2 if it includes multibyte character.  Give up in
	 such case.  */
      else if (!multibyte || !CHARSET_RANGE_TABLE_EXISTS_P (p2))

	     Since we know that all the character listed in
	     P2 is ASCII, it is enough to test only bitmap
	     table of P1.  */

	  if (*p1 == *p2)
	    {
	      int idx;
	      /* We win if the charset inside the loop
		 has no overlap with the one after the loop.  */
	      for (idx = 0;

		{
		  DEBUG_PRINT1 ("	 No match => fast loop.\n");
		  return 1;
		}
	    }
	  else if ((re_opcode_t) *p1 == charset
		   || (re_opcode_t) *p1 == charset_not)
	    {
	      int idx;
	      /* We win if the charset_not inside the loop lists
		 every character listed in the charset after.	 */
	      for (idx = 0; idx < (int) p2[1]; idx++)

		  }
	      }
	  }
      }
      
    case wordend:
    case notsyntaxspec:
      return ((re_opcode_t) *p1 == syntaxspec
	      && p1[1] == (op2 == wordend ? Sword : p2[1]));

35525:95c2eedea354

    case endline:
    case exactn:
      {
	register re_wchar_t c
	  = (re_opcode_t) *p2 == endline ? '\n'
	  : RE_STRING_CHAR (p2 + 2, pend - p2 - 2);

	if ((re_opcode_t) *p1 == exactn)
	  {
	    if (c != RE_STRING_CHAR (p1 + 2, pend - p1 - 2))
	      {

	  }
      }
      break;

    case charset:
      {
	if ((re_opcode_t) *p1 == exactn)
	  /* Reuse the code above.  */
	  return mutually_exclusive_p (bufp, p2, p1);

      /* It is hard to list up all the character in charset
	 P2 if it includes multibyte character.  Give up in
	 such case.  */
      else if (!multibyte || !CHARSET_RANGE_TABLE_EXISTS_P (p2))

	     Since we know that all the character listed in
	     P2 is ASCII, it is enough to test only bitmap
	     table of P1.  */

	  if ((re_opcode_t) *p1 == charset)
	    {
	      int idx;
	      /* We win if the charset inside the loop
		 has no overlap with the one after the loop.  */
	      for (idx = 0;

		{
		  DEBUG_PRINT1 ("	 No match => fast loop.\n");
		  return 1;
		}
	    }
	  else if ((re_opcode_t) *p1 == charset_not)
	    {
	      int idx;
	      /* We win if the charset_not inside the loop lists
		 every character listed in the charset after.	 */
	      for (idx = 0; idx < (int) p2[1]; idx++)

		  }
	      }
	  }
      }
      
    case charset_not:
      switch (SWITCH_ENUM_CAST (*p1))
	{
	case exactn:
	case charset:
	  /* Reuse the code above.  */
	  return mutually_exclusive_p (bufp, p2, p1);
	case charset_not:
	  /* When we have two charset_not, it's very unlikely that
	     they don't overlap.  The union of the two sets of excluded
	     chars should cover all possible chars, which, as a matter of
	     fact, is virtually impossible in multibyte buffers.  */
	  ;
	}
      break;

    case wordend:
    case notsyntaxspec:
      return ((re_opcode_t) *p1 == syntaxspec
	      && p1[1] == (op2 == wordend ? Sword : p2[1]));