From 48727370d7fccccb6c1f4f8f295f5aef28980fc6 Mon Sep 17 00:00:00 2001 From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com> Date: Thu, 23 Feb 2023 13:51:28 +0100 Subject: [PATCH] Parser v0 & hide void --- .../jeffcheasey88/peeratcode/parser/java/Class.java | 3 +++ .../peeratcode/parser/java/JavaParser.java | 12 ++++++++++++ .../peeratcode/repository/DatabaseRepository.java | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/Class.java b/src/be/jeffcheasey88/peeratcode/parser/java/Class.java index 782613c..3b58325 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/Class.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/Class.java @@ -13,6 +13,7 @@ public class Class { private String name; private Listvars; + private Listfunctions; public Class(){} @@ -27,6 +28,7 @@ public class Class { this.name = split[split.length-1]; this.vars = new ArrayList<>(); + this.functions = new ArrayList<>(); content = matcher.group(3); Pattern empty = Pattern.compile("^\\s*$"); @@ -46,6 +48,7 @@ public class Class { }else{ Function func = new Function(); int index = func.parse(content); + this.functions.add(func); content = content.substring(index); } } diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java index 6f81ca3..c241e29 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java @@ -43,6 +43,18 @@ public class JavaParser { content = content.substring(index); } + public Package getPackage(){ + return this.pack; + } + + public List getImports(){ + return this.imports; + } + + public Class getClazz(){ + return this.clazz; + } + public static int getModifier(String modifier){ switch(modifier){ case "public": return Modifier.PUBLIC; diff --git a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java index 7f6a9c5..c0a641b 100644 --- a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java +++ b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java @@ -18,7 +18,7 @@ public class DatabaseRepository { private static final String SPECIFIC_PUZZLE_QUERY = "SELECT * FROM puzzles WHERE id_puzzle = ?"; private static final String SPECIFIC_CHAPTER_QUERY = "SELECT * FROM chapters WHERE id_chapter = ?"; private static final String PUZZLES_IN_CHAPTER_QUERY = "SELECT * FROM puzzles WHERE fk_chapter = ?"; - private static final String ALL_CHAPTERS_QUERY = "SELECT * FROM chapters"; + private static final String ALL_CHAPTERS_QUERY = "SELECT * FROM chapters WHERE id_chapter > 0"; private static final String CHECK_PSEUDO_AVAILABLE_QUERY = "SELECT * FROM players WHERE pseudo = ?"; private static final String CHECK_EMAIL_AVAILABLE_QUERY = "SELECT * FROM players WHERE email = ?"; private static final String REGISTER_QUERY = "INSERT INTO players (pseudo, email, passwd, firstname, lastname, description, sgroup, avatar) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";