Fix glsl attribute parsing error

Author: xCollateral

src/main/java/net/vulkanmod/vulkan/shader/converter/GLSLParser.java

@@ -326,6 +326,14 @@ private void parseUniformBlock() {
     private void parseAttribute() {
         this.state = State.ATTRIBUTE;
 
+        Node prevNode = this.prevNode(true);
+
+        // Check if we are not inside a function declaration
+        if (prevNode != null && (prevNode.type.equals(Token.TokenType.LEFT_PARENTHESIS.name()) || prevNode.type.equals(Token.TokenType.COMMA.name())))
+        {
+            return;
+        }
+
         String ioType = this.currentToken.value;
 
         advanceToken(true);
@@ -445,19 +453,75 @@ private void advanceToken(boolean skipSpace) {
         }
     }
 
-    private Token nextToken(int i) {
-        return this.tokens.get(this.currentTokenIdx + i);
+    private Token prevToken(boolean skipSpace) {
+        int tokenIdx = this.currentTokenIdx - 1;
+        Token token;
+
+        if (tokenIdx == 0) {
+            return null;
+        }
+
+        tokenIdx--;
+        token = this.tokens.get(tokenIdx);
+
+        while (skipSpace && tokenIdx != 0 &&
+               (token.type == Token.TokenType.SPACING || token.type == Token.TokenType.PREPROCESSOR || token.type == Token.TokenType.COMMENT))
+        {
+            tokenIdx--;
+            token = this.tokens.get(tokenIdx);
+        }
+
+        if (skipSpace && (token.type == Token.TokenType.SPACING || token.type == Token.TokenType.COMMENT || token.type == Token.TokenType.PREPROCESSOR)) {
+            return null;
+        }
+
+        return token;
+    }
+
+    private Node prevNode(boolean skipSpace) {
+        var nodes = getNodeStream();
+        int idx = nodes.size() - 1;
+        String type;
+
+        if (idx == 0) {
+            return null;
+        }
+
+        idx--;
+        Node node;
+        node = nodes.get(idx);
+        type = node.type;
+
+        while (skipSpace && idx != 0 &&
+               (type.equals(Token.TokenType.SPACING.name()) || type.equals(Token.TokenType.PREPROCESSOR.name()) || type.equals(Token.TokenType.COMMENT.name())))
+        {
+            idx--;
+            node = nodes.get(idx);
+            type = node.type;
+        }
+
+        if (skipSpace &&
+            (type.equals(Token.TokenType.SPACING.name()) || type.equals(Token.TokenType.PREPROCESSOR.name()) || type.equals(Token.TokenType.COMMENT.name())))
+        {
+            return null;
+        }
+
+        return node;
     }
 
     private void appendToken(Token token) {
         this.appendNode(Node.fromToken(token));
     }
 
     private void appendNode(Node node) {
-        switch (this.stage) {
-            case VERTEX -> this.vsStream.add(node);
-            case FRAGMENT -> this.fsStream.add(node);
-        }
+        this.getNodeStream().add(node);
+    }
+
+    private LinkedList<Node> getNodeStream() {
+        return switch (this.stage) {
+            case VERTEX -> this.vsStream;
+            case FRAGMENT -> this.fsStream;
+        };
     }
 
     public String getOutput(Stage stage) {
@@ -565,7 +629,7 @@ public Node(String type, String value) {
         }
 
         public static Node fromToken(Token token) {
-            return new Node("token:%s".formatted(token.type), token.value);
+            return new Node(token.type.name(), token.value);
         }
 
         @Override

src/main/java/net/vulkanmod/vulkan/shader/converter/Lexer.java

@@ -66,9 +66,13 @@ public Token nextToken() {
 
         // Comment
         if (currentChar == '/') {
-            if (peek() == '/') {
-                advance(2);
-                return this.comment();
+            switch (peek()) {
+                case '/' -> {
+                    return this.lineComment();
+                }
+                case '*' -> {
+                    return this.multiLineComment();
+                }
             }
         }
 
@@ -168,9 +172,11 @@ public Token nextToken() {
         return token;
     }
 
-    private Token comment() {
+    private Token lineComment() {
         StringBuilder sb = new StringBuilder();
         sb.append("//");
+        this.advance(2);
+
         while (checkEOF() && currentChar != '\n') {
             sb.append(currentChar);
             advance();
@@ -182,6 +188,24 @@ private Token comment() {
         return new Token(Token.TokenType.COMMENT, value);
     }
 
+    private Token multiLineComment() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("/*");
+        this.advance(2);
+
+        while (checkEOF() && currentChar != '*' && this.peek() != '/') {
+            sb.append(currentChar);
+            advance();
+        }
+        sb.append(currentChar);
+        advance();
+        sb.append(currentChar);
+        advance();
+
+        String value = sb.toString();
+        return new Token(Token.TokenType.COMMENT, value);
+    }
+
     private Token identifier() {
         StringBuilder sb = new StringBuilder();
         while (checkEOF() && Character.isJavaIdentifierPart(currentChar)) {