Skip to content

Commit b012258

Browse files
pmiouletpmioulet
committed
Fixed obvious issues
1 parent f35060f commit b012258

3 files changed

Lines changed: 68 additions & 63 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.iml
88
*.ipr
99
*.iws
10+
.vscode
1011

1112
/bin
1213
/build

‎rivescript-core/src/main/java/com/rivescript/RiveScript.java‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,54 @@
2222

2323
package com.rivescript;
2424

25+
import static com.rivescript.regexp.Regexp.RE_ANY_TAG;
26+
import static com.rivescript.regexp.Regexp.RE_ARRAY;
27+
import static com.rivescript.regexp.Regexp.RE_BOT_VAR;
28+
import static com.rivescript.regexp.Regexp.RE_CALL;
29+
import static com.rivescript.regexp.Regexp.RE_CONDITION;
30+
import static com.rivescript.regexp.Regexp.RE_INHERITS;
31+
import static com.rivescript.regexp.Regexp.RE_META;
32+
import static com.rivescript.regexp.Regexp.RE_OPTIONAL;
33+
import static com.rivescript.regexp.Regexp.RE_PLACEHOLDER;
34+
import static com.rivescript.regexp.Regexp.RE_RANDOM;
35+
import static com.rivescript.regexp.Regexp.RE_REDIRECT;
36+
import static com.rivescript.regexp.Regexp.RE_SET;
37+
import static com.rivescript.regexp.Regexp.RE_SYMBOLS;
38+
import static com.rivescript.regexp.Regexp.RE_TOPIC;
39+
import static com.rivescript.regexp.Regexp.RE_USER_VAR;
40+
import static com.rivescript.regexp.Regexp.RE_WEIGHT;
41+
import static com.rivescript.regexp.Regexp.RE_ZERO_WITH_STAR;
42+
import static com.rivescript.session.SessionManager.HISTORY_SIZE;
43+
import static com.rivescript.util.StringUtils.countWords;
44+
import static com.rivescript.util.StringUtils.quoteMetacharacters;
45+
import static com.rivescript.util.StringUtils.stripNasties;
46+
import static java.util.Objects.requireNonNull;
47+
48+
import java.io.BufferedReader;
49+
import java.io.File;
50+
import java.io.FileReader;
51+
import java.io.FilenameFilter;
52+
import java.io.IOException;
53+
import java.io.InputStream;
54+
import java.io.InputStreamReader;
55+
import java.io.Reader;
56+
import java.nio.charset.Charset;
57+
import java.nio.charset.StandardCharsets;
58+
import java.util.ArrayList;
59+
import java.util.Arrays;
60+
import java.util.Collections;
61+
import java.util.Comparator;
62+
import java.util.HashMap;
63+
import java.util.Iterator;
64+
import java.util.List;
65+
import java.util.Map;
66+
import java.util.Random;
67+
import java.util.regex.Matcher;
68+
import java.util.regex.Pattern;
69+
70+
import org.slf4j.Logger;
71+
import org.slf4j.LoggerFactory;
72+
2573
import com.rivescript.ast.ObjectMacro;
2674
import com.rivescript.ast.Root;
2775
import com.rivescript.ast.Topic;
@@ -45,53 +93,6 @@
4593
import com.rivescript.sorting.SortTrack;
4694
import com.rivescript.sorting.SortedTriggerEntry;
4795
import com.rivescript.util.StringUtils;
48-
import org.slf4j.Logger;
49-
import org.slf4j.LoggerFactory;
50-
51-
import java.io.BufferedReader;
52-
import java.io.File;
53-
import java.io.FileReader;
54-
import java.io.FilenameFilter;
55-
import java.io.InputStream;
56-
import java.io.InputStreamReader;
57-
import java.io.IOException;
58-
import java.io.Reader;
59-
import java.nio.charset.Charset;
60-
import java.nio.charset.StandardCharsets;
61-
import java.util.ArrayList;
62-
import java.util.Arrays;
63-
import java.util.Collections;
64-
import java.util.Comparator;
65-
import java.util.HashMap;
66-
import java.util.Iterator;
67-
import java.util.List;
68-
import java.util.Map;
69-
import java.util.Random;
70-
import java.util.regex.Matcher;
71-
import java.util.regex.Pattern;
72-
73-
import static com.rivescript.regexp.Regexp.RE_ANY_TAG;
74-
import static com.rivescript.regexp.Regexp.RE_ARRAY;
75-
import static com.rivescript.regexp.Regexp.RE_BOT_VAR;
76-
import static com.rivescript.regexp.Regexp.RE_CALL;
77-
import static com.rivescript.regexp.Regexp.RE_CONDITION;
78-
import static com.rivescript.regexp.Regexp.RE_INHERITS;
79-
import static com.rivescript.regexp.Regexp.RE_META;
80-
import static com.rivescript.regexp.Regexp.RE_OPTIONAL;
81-
import static com.rivescript.regexp.Regexp.RE_PLACEHOLDER;
82-
import static com.rivescript.regexp.Regexp.RE_RANDOM;
83-
import static com.rivescript.regexp.Regexp.RE_REDIRECT;
84-
import static com.rivescript.regexp.Regexp.RE_SET;
85-
import static com.rivescript.regexp.Regexp.RE_SYMBOLS;
86-
import static com.rivescript.regexp.Regexp.RE_TOPIC;
87-
import static com.rivescript.regexp.Regexp.RE_USER_VAR;
88-
import static com.rivescript.regexp.Regexp.RE_WEIGHT;
89-
import static com.rivescript.regexp.Regexp.RE_ZERO_WITH_STAR;
90-
import static com.rivescript.session.SessionManager.HISTORY_SIZE;
91-
import static com.rivescript.util.StringUtils.countWords;
92-
import static com.rivescript.util.StringUtils.quoteMetacharacters;
93-
import static com.rivescript.util.StringUtils.stripNasties;
94-
import static java.util.Objects.requireNonNull;
9596

9697
/**
9798
* A RiveScript interpreter written in Java.
@@ -792,10 +793,12 @@ private void parse(String filename, String[] code) throws ParserException {
792793
}
793794
}
794795
for (Map.Entry<String, List<String>> entry : ast.getBegin().getArray().entrySet()) {
795-
if (entry.getValue().equals(UNDEF_TAG)) {
796-
this.array.remove(entry.getKey());
797-
} else {
798-
this.array.put(entry.getKey(), entry.getValue());
796+
for(String value : entry.getValue()) {
797+
if (value.equals(UNDEF_TAG)) {
798+
this.array.remove(entry.getKey());
799+
} else {
800+
this.array.put(entry.getKey(), entry.getValue());
801+
}
799802
}
800803
}
801804

@@ -2359,7 +2362,7 @@ private String triggerRegexp(String username, String pattern) {
23592362
String inputPattern = "<input" + i + ">";
23602363
String replyPattern = "<reply" + i + ">";
23612364
History history = this.sessions.getHistory(username);
2362-
if (history == null) {
2365+
if (history != null) {
23632366
pattern = pattern.replace(inputPattern, history.getInput(i - 1));
23642367
pattern = pattern.replace(replyPattern, history.getReply(i - 1));
23652368
} else {

‎rivescript-core/src/main/java/com/rivescript/lang/Perl.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@
2222

2323
package com.rivescript.lang;
2424

25-
import com.rivescript.RiveScript;
26-
import com.rivescript.macro.ObjectHandler;
27-
import com.rivescript.util.StringUtils;
28-
import org.json.JSONException;
29-
import org.json.JSONObject;
30-
import org.slf4j.Logger;
31-
import org.slf4j.LoggerFactory;
25+
import static java.util.Objects.requireNonNull;
3226

3327
import java.io.BufferedReader;
3428
import java.io.IOException;
@@ -39,7 +33,14 @@
3933
import java.util.Map;
4034
import java.util.Vector;
4135

42-
import static java.util.Objects.requireNonNull;
36+
import org.json.JSONException;
37+
import org.json.JSONObject;
38+
import org.slf4j.Logger;
39+
import org.slf4j.LoggerFactory;
40+
41+
import com.rivescript.RiveScript;
42+
import com.rivescript.macro.ObjectHandler;
43+
import com.rivescript.util.StringUtils;
4344

4445
/**
4546
* Perl programming language support for RiveScript-Java.
@@ -51,7 +52,7 @@ public class Perl implements ObjectHandler {
5152

5253
private static Logger logger = LoggerFactory.getLogger(Perl.class);
5354

54-
private String rsp4j; // Path to the Perl script
55+
private String rsp4j; // Path to the Perl script
5556
private HashMap<String, String> codes; // Object codes
5657

5758
/**
@@ -90,7 +91,7 @@ public String call(RiveScript rs, String name, String[] fields) {
9091
// Transcode the user's data into a JSON object.
9192
JSONObject vars = new JSONObject();
9293
Map<String, String> data = rs.getUservars(user).getVariables();
93-
Iterator it = data.keySet().iterator();
94+
Iterator<String> it = data.keySet().iterator();
9495
while (it.hasNext()) {
9596
String key = it.next().toString();
9697
vars.put(key, data.get(key));
@@ -136,7 +137,7 @@ public String call(RiveScript rs, String name, String[] fields) {
136137

137138
// Send back any new user vars.
138139
JSONObject newVars = reply.getJSONObject("vars");
139-
String[] keys = reply.getNames(newVars);
140+
String[] keys = JSONObject.getNames(newVars);
140141
for (int i = 0; i < keys.length; i++) {
141142
String value = newVars.getString(keys[i]);
142143
rs.setUservar(user, keys[i], value);

0 commit comments

Comments
 (0)