comparison src/regex.c @ 274:ca9a9ec9c1c1 r21-0b35

Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children c42ec1d1cded
comparison
equal deleted inserted replaced
273:411aac7253ef 274:ca9a9ec9c1c1
699 } 699 }
700 700
701 /* Loop over pattern commands. */ 701 /* Loop over pattern commands. */
702 while (p < pend) 702 while (p < pend)
703 { 703 {
704 printf ("%d:\t", p - start); 704 printf ("%ld:\t", (long)(p - start));
705 705
706 switch ((re_opcode_t) *p++) 706 switch ((re_opcode_t) *p++)
707 { 707 {
708 case no_op: 708 case no_op:
709 printf ("/no_op"); 709 printf ("/no_op");
798 unified_range_table_get_range (p, i, &first, &last, 798 unified_range_table_get_range (p, i, &first, &last,
799 &dummy_val); 799 &dummy_val);
800 if (first < 0x100) 800 if (first < 0x100)
801 putchar (first); 801 putchar (first);
802 else 802 else
803 printf ("(0x%x)", first); 803 printf ("(0x%lx)", (long)first);
804 if (first != last) 804 if (first != last)
805 { 805 {
806 putchar ('-'); 806 putchar ('-');
807 if (last < 0x100) 807 if (last < 0x100)
808 putchar (last); 808 putchar (last);
809 else 809 else
810 printf ("(0x%x)", last); 810 printf ("(0x%lx)", (long)last);
811 } 811 }
812 } 812 }
813 putchar (']'); 813 putchar (']');
814 p += unified_range_table_bytes_used (p); 814 p += unified_range_table_bytes_used (p);
815 } 815 }
824 printf ("/endline"); 824 printf ("/endline");
825 break; 825 break;
826 826
827 case on_failure_jump: 827 case on_failure_jump:
828 extract_number_and_incr (&mcnt, &p); 828 extract_number_and_incr (&mcnt, &p);
829 printf ("/on_failure_jump to %d", p + mcnt - start); 829 printf ("/on_failure_jump to %ld", (long)(p + mcnt - start));
830 break; 830 break;
831 831
832 case on_failure_keep_string_jump: 832 case on_failure_keep_string_jump:
833 extract_number_and_incr (&mcnt, &p); 833 extract_number_and_incr (&mcnt, &p);
834 printf ("/on_failure_keep_string_jump to %d", p + mcnt - start); 834 printf ("/on_failure_keep_string_jump to %ld", (long)(p + mcnt - start));
835 break; 835 break;
836 836
837 case dummy_failure_jump: 837 case dummy_failure_jump:
838 extract_number_and_incr (&mcnt, &p); 838 extract_number_and_incr (&mcnt, &p);
839 printf ("/dummy_failure_jump to %d", p + mcnt - start); 839 printf ("/dummy_failure_jump to %ld", (long)(p + mcnt - start));
840 break; 840 break;
841 841
842 case push_dummy_failure: 842 case push_dummy_failure:
843 printf ("/push_dummy_failure"); 843 printf ("/push_dummy_failure");
844 break; 844 break;
845 845
846 case maybe_pop_jump: 846 case maybe_pop_jump:
847 extract_number_and_incr (&mcnt, &p); 847 extract_number_and_incr (&mcnt, &p);
848 printf ("/maybe_pop_jump to %d", p + mcnt - start); 848 printf ("/maybe_pop_jump to %ld", (long)(p + mcnt - start));
849 break; 849 break;
850 850
851 case pop_failure_jump: 851 case pop_failure_jump:
852 extract_number_and_incr (&mcnt, &p); 852 extract_number_and_incr (&mcnt, &p);
853 printf ("/pop_failure_jump to %d", p + mcnt - start); 853 printf ("/pop_failure_jump to %ld", (long)(p + mcnt - start));
854 break; 854 break;
855 855
856 case jump_past_alt: 856 case jump_past_alt:
857 extract_number_and_incr (&mcnt, &p); 857 extract_number_and_incr (&mcnt, &p);
858 printf ("/jump_past_alt to %d", p + mcnt - start); 858 printf ("/jump_past_alt to %ld", (long)(p + mcnt - start));
859 break; 859 break;
860 860
861 case jump: 861 case jump:
862 extract_number_and_incr (&mcnt, &p); 862 extract_number_and_incr (&mcnt, &p);
863 printf ("/jump to %d", p + mcnt - start); 863 printf ("/jump to %ld", (long)(p + mcnt - start));
864 break; 864 break;
865 865
866 case succeed_n: 866 case succeed_n:
867 extract_number_and_incr (&mcnt, &p); 867 extract_number_and_incr (&mcnt, &p);
868 extract_number_and_incr (&mcnt2, &p); 868 extract_number_and_incr (&mcnt2, &p);
869 printf ("/succeed_n to %d, %d times", p + mcnt - start, mcnt2); 869 printf ("/succeed_n to %ld, %d times", (long)(p + mcnt - start), mcnt2);
870 break; 870 break;
871 871
872 case jump_n: 872 case jump_n:
873 extract_number_and_incr (&mcnt, &p); 873 extract_number_and_incr (&mcnt, &p);
874 extract_number_and_incr (&mcnt2, &p); 874 extract_number_and_incr (&mcnt2, &p);
875 printf ("/jump_n to %d, %d times", p + mcnt - start, mcnt2); 875 printf ("/jump_n to %ld, %d times", (long)(p + mcnt - start), mcnt2);
876 break; 876 break;
877 877
878 case set_number_at: 878 case set_number_at:
879 extract_number_and_incr (&mcnt, &p); 879 extract_number_and_incr (&mcnt, &p);
880 extract_number_and_incr (&mcnt2, &p); 880 extract_number_and_incr (&mcnt2, &p);
881 printf ("/set_number_at location %d to %d", p + mcnt - start, mcnt2); 881 printf ("/set_number_at location %ld to %d", (long)(p + mcnt - start), mcnt2);
882 break; 882 break;
883 883
884 case wordbound: 884 case wordbound:
885 printf ("/wordbound"); 885 printf ("/wordbound");
886 break; 886 break;
959 } 959 }
960 960
961 putchar ('\n'); 961 putchar ('\n');
962 } 962 }
963 963
964 printf ("%d:\tend of pattern.\n", p - start); 964 printf ("%ld:\tend of pattern.\n", (long)(p - start));
965 } 965 }
966 966
967 967
968 static void 968 static void
969 print_compiled_pattern (struct re_pattern_buffer *bufp) 969 print_compiled_pattern (struct re_pattern_buffer *bufp)