Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix inconsistent names of languages #1902

Merged
merged 5 commits into from
Aug 29, 2024
Merged

Fix inconsistent names of languages #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d150a6a
refactor language names
Kr0nox Aug 3, 2024
08bf805
update names in report viewer
Kr0nox Aug 3, 2024
bcec0e2
fix report viewer build
Kr0nox Aug 3, 2024
630e27b
change LLVM IR name
Kr0nox Aug 15, 2024
7eeee1f
Merge remote-tracking branch 'origin/develop' into feature/better-lan…
Kr0nox Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion languages/c/src/main/java/de/jplag/c/CLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

@MetaInfServices(de.jplag.Language.class)
public class CLanguage implements Language {
private static final String NAME = "C";
private static final String IDENTIFIER = "c";

private final Scanner scanner; // c code is scanned not parsed
Expand All @@ -27,7 +28,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "C Scanner";
return NAME;
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/
@MetaInfServices(Language.class)
public class CPPLanguage extends AbstractAntlrLanguage {
private static final String NAME = "C++";
private static final String IDENTIFIER = "cpp";

public CPPLanguage() {
Expand All @@ -23,7 +24,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "C++ Parser";
return NAME;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
@MetaInfServices(de.jplag.Language.class)
public class CSharpLanguage extends AbstractAntlrLanguage {
private static final String NAME = "C# 6 Parser";
private static final String NAME = "C#";
private static final String IDENTIFIER = "csharp";
private static final String[] FILE_ENDINGS = new String[] {".cs", ".CS"};
private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
Expand Down
2 changes: 1 addition & 1 deletion languages/golang/src/main/java/de/jplag/golang/GoLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@MetaInfServices(de.jplag.Language.class)
public class GoLanguage extends AbstractAntlrLanguage {
private static final String NAME = "Go Parser";
private static final String NAME = "Go";
private static final String IDENTIFIER = "go";
private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
private static final String[] FILE_EXTENSIONS = {".go"};
Expand Down
3 changes: 2 additions & 1 deletion languages/java/src/main/java/de/jplag/java/JavaLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
@MetaInfServices(de.jplag.Language.class)
public class JavaLanguage implements de.jplag.Language {
private static final String NAME = "Java";
private static final String IDENTIFIER = "java";

private final Parser parser;
Expand All @@ -29,7 +30,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "Javac based AST plugin";
return NAME;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion languages/kotlin/src/main/java/de/jplag/kotlin/KotlinLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@MetaInfServices(de.jplag.Language.class)
public class KotlinLanguage extends AbstractAntlrLanguage {

private static final String NAME = "Kotlin Parser";
private static final String NAME = "Kotlin";
private static final String IDENTIFIER = "kotlin";
private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
private static final String[] FILE_EXTENSIONS = {".kt"};
Expand Down
2 changes: 1 addition & 1 deletion languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@MetaInfServices(Language.class)
public class LLVMIRLanguage extends AbstractAntlrLanguage {

private static final String NAME = "LLVMIR Parser";
private static final String NAME = "LLVM IR";
private static final String IDENTIFIER = "llvmir";
private static final int DEFAULT_MIN_TOKEN_MATCH = 70;
private static final String[] FILE_EXTENSIONS = {".ll"};
Expand Down
4 changes: 2 additions & 2 deletions languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@MetaInfServices(de.jplag.Language.class)
public class PythonLanguage extends AbstractAntlrLanguage {

private static final String NAME = "Python";
private static final String IDENTIFIER = "python3";

public PythonLanguage() {
Expand All @@ -20,7 +20,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "Python3 Parser";
return NAME;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion languages/rlang/src/main/java/de/jplag/rlang/RLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@MetaInfServices(de.jplag.Language.class)
public class RLanguage implements de.jplag.Language {

private static final String NAME = "R Parser";
private static final String NAME = "R";
private static final String IDENTIFIER = "rlang";
private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
private static final String[] FILE_EXTENSION = {".R", ".r"};
Expand Down
2 changes: 1 addition & 1 deletion languages/rust/src/main/java/de/jplag/rust/RustLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class RustLanguage implements de.jplag.Language {

protected static final String[] FILE_EXTENSIONS = {".rs"};
private static final String NAME = "Rust Language Module";
private static final String NAME = "Rust";
private static final String IDENTIFIER = "rust";
private static final int MINIMUM_TOKEN_MATCH = 8;

Expand Down
2 changes: 1 addition & 1 deletion languages/scala/src/main/scala/de/jplag/scala/ScalaLanguage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ScalaLanguage extends de.jplag.Language {

override def suffixes: Array[String] = fileExtensions

override def getName = "Scala parser"
override def getName = "Scala"

override def getIdentifier = "scala"

Expand Down
3 changes: 2 additions & 1 deletion languages/scheme/src/main/java/de/jplag/scheme/SchemeLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@MetaInfServices(de.jplag.Language.class)
public class SchemeLanguage implements de.jplag.Language {

private static final String NAME = "Scheme";
private static final String IDENTIFIER = "scheme";
private final de.jplag.scheme.Parser parser;

Expand All @@ -26,7 +27,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "SchemeR4RS Parser [basic markup]";
return NAME;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion languages/scxml/src/main/java/de/jplag/scxml/ScxmlLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ScxmlLanguage implements de.jplag.Language {
*/
public static final String VIEW_FILE_SUFFIX = ".scxmlview";

private static final String NAME = "SCXML (Statechart XML)";
private static final String NAME = "SCXML";
private static final String IDENTIFIER = "scxml";
private static final int DEFAULT_MIN_TOKEN_MATCH = 6;

Expand Down
2 changes: 1 addition & 1 deletion languages/swift/src/main/java/de/jplag/swift/SwiftLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class SwiftLanguage implements de.jplag.Language {

private static final String IDENTIFIER = "swift";

private static final String NAME = "Swift Parser";
private static final String NAME = "Swift";
private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
private static final String[] FILE_EXTENSIONS = {".swift"};
private final SwiftParserAdapter parserAdapter;
Expand Down
3 changes: 2 additions & 1 deletion languages/text/src/main/java/de/jplag/text/NaturalLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
public class NaturalLanguage implements de.jplag.Language {

private static final String IDENTIFIER = "text";
private static final String NAME = "Text (naive)";
private final ParserAdapter parserAdapter;

public NaturalLanguage() {
Expand All @@ -31,7 +32,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "Text Parser (naive)";
return NAME;
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion languages/typescript/src/main/java/de/jplag/typescript/TypeScriptLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
public class TypeScriptLanguage extends AbstractAntlrLanguage {

private static final String IDENTIFIER = "typescript";
private static final String NAME = "TypeScript";
private final TypeScriptLanguageOptions options = new TypeScriptLanguageOptions();

@Override
Expand All @@ -20,7 +21,7 @@ public String[] suffixes() {

@Override
public String getName() {
return "Typescript Parser";
return NAME;
}

@Override
Expand Down