diff options
| author | Jason Tsay <jasontsay@google.com> | 2011-07-14 14:38:38 -0700 |
|---|---|---|
| committer | Jason Tsay <jasontsay@google.com> | 2011-07-14 14:49:35 -0700 |
| commit | eae51d647d3da8bbb4ab8ab2ef1276bffd785437 (patch) | |
| tree | 5ff072eb2b87ce47ba4c19d7fa6251f4a5b286de | |
| parent | ba3b8414a98c81371cffa65ec8769d29c46d6b8a (diff) | |
| download | prolog-cafe-eae51d647d3da8bbb4ab8ab2ef1276bffd785437.tar.gz | |
Renames regex to regex_matches in builtins.pl
Change-Id: I24b3d734983fd5f98a64c435b20f2b647c4d3bf6
| -rw-r--r-- | src/builtin/builtins.pl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/builtin/builtins.pl b/src/builtin/builtins.pl index b6dcda6..9b4d15a 100644 --- a/src/builtin/builtins.pl +++ b/src/builtin/builtins.pl @@ -1693,8 +1693,10 @@ once(G) :- call(G), !. %:- public char_code/2. written in Java %:- public number_chars/2, number_codes/2. written in Java :- public name/2. -:- public regex/3. -:- public regex/2. +%:- public regex_compile/2. written in Java +%:- public regex_match/3. written in Java +:- public regex_matches/3. +:- public regex_matches/2. sub_atom(Atom, Before, Length, After, Sub_atom) :- atom_concat(AtomL, X, Atom), @@ -1716,20 +1718,20 @@ name(Constant, Chars) :- ; illarg(type(list(char)), name(Constant,Chars), 2) ). -regex(_, [], _) :- !, fail. -regex(Pattern, List, Result) :- +regex_matches(_, [], _) :- !, fail. +regex_matches(Pattern, List, Result) :- List = [_ | _], !, regex_list(Pattern, List, Result). -regex(Pattern, String, Result) :- +regex_matches(Pattern, String, Result) :- atom(String), regex_compile(Pattern, Matcher), regex_match(Matcher, String, Result). -regex(Pattern, String) :- - once(regex(Pattern, String, _)). +regex_matches(Pattern, String) :- + once(regex_matches(Pattern, String, _)). -regex_list(Pattern, [H | _ ], Result) :- regex(Pattern, H, Result). +regex_list(Pattern, [H | _ ], Result) :- regex_matches(Pattern, H, Result). regex_list(Pattern, [_ | Ls], Result) :- regex_list(Pattern, Ls, Result). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |