oysteikt-skolearbeid/TDT4100-project
oysteikt-skolearbeid
/
TDT4100-project
1
0
Fork 0
Code Issues Pull Requests Activity

Fix java commenting issues

This commit is contained in:
Oystein Kristoffer Tveit 2021-03-01 14:10:34 +01:00
parent 35a370626f
commit 73e2f15232
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/app/model/languages/Java.java
View File

@ -35,20 +35,20 @@ public class Java implements ProgrammingLanguage {
private static final Map<Pattern, String> pattern = private static final Map<Pattern, String> pattern =
Map.ofEntries( Map.ofEntries(
e("\"([^\"\\\\]|\\\\.)*\"", "string"), e("\"([^\"\\\\]|\\\\.)*\"", "string"),
e("\\bthis\\b", "this"), e("\\bthis\\b", "this"),
e("\\btrue\\b", "true"), e("\\btrue\\b", "true"),
e("\\bfalse\\b", "false"), e("\\bfalse\\b", "false"),
e("(?<=\\.?)\\w+(?=\\()", "method"), e("(?<=\\.?)\\w+(?=\\()", "method"),
e("\\(|\\)", "paranthesis"), e("\\(|\\)", "paranthesis"),
e("\\{|\\}", "curlyBrackets"), e("\\{|\\}", "curlyBrackets"),
e("\\[|\\]", "squareBrackets"), e("\\[|\\]", "squareBrackets"),
e(";", "semicolon"), e(";", "semicolon"),
e("\\.\\w+\\b(?!\\()", "property"), e("\\.\\w+\\b(?!\\()", "property"),
e("\\b[A-Z]\\w+\\b", "identifier"), e("\\b[A-Z]\\w+\\b", "identifier"),
e("\\b(" + String.join("|", keywords) + ")\\b", e("\\b(" + String.join("|", keywords) + ")\\b",
"keyword"), "keyword"),
e("(?://.*)|/\\*(?:\\n|.)*\\*/", "comment") e("(?://.*)|/\\*(?:\\n|.)*?\\*/", "comment")
); );
public String getName() { public String getName() {
@ -113,8 +113,7 @@ public class Java implements ProgrammingLanguage {
lines.length < 2 || lines.length < 2 ||
Arrays.asList(Arrays.copyOfRange(lines, 1, lines.length - 1)) Arrays.asList(Arrays.copyOfRange(lines, 1, lines.length - 1))
.stream() .stream()
.map(l -> l.startsWith(" * ")) .allMatch(l -> l.startsWith(" * "));
.allMatch(b -> b);
return return
Stream.of( Stream.of(