refactor version statement handling and names

douira · douira · commit f2c55bde9546 · 2022-10-02T17:19:34.000+02:00
diff --git a/glsl-transformer/src/main/antlr/GLSLLexer.g4 b/glsl-transformer/src/main/antlr/GLSLLexer.g4
@@ -376,23 +376,23 @@ NR_STDGL: 'STDGL';
 NR_CORE: 'core';
 NR_COMPATIBILITY: 'compatibility';
 NR_ES: 'es';
-NR_GL_110: '110';
-NR_GL_120: '120';
-NR_GLES_100: '100';
-NR_GL_130: '130';
-NR_GL_140: '140';
-NR_GL_150: '150';
-NR_GL_330: '330';
-NR_GLES_300: '300';
-NR_GLES_310: '310';
-NR_GLES_320: '320';
-NR_GL_400: '400';
-NR_GL_410: '410';
-NR_GL_420: '420';
-NR_GL_430: '430';
-NR_GL_440: '440';
-NR_GL_450: '450';
-NR_GL_460: '460';
+NR_GLSL_110: '110';
+NR_GLSL_120: '120';
+NR_GLSLES_100: '100';
+NR_GLSL_130: '130';
+NR_GLSL_140: '140';
+NR_GLSL_150: '150';
+NR_GLSL_330: '330';
+NR_GLSLES_300: '300';
+NR_GLSLES_310: '310';
+NR_GLSLES_320: '320';
+NR_GLSL_400: '400';
+NR_GLSL_410: '410';
+NR_GLSL_420: '420';
+NR_GLSL_430: '430';
+NR_GLSL_440: '440';
+NR_GLSL_450: '450';
+NR_GLSL_460: '460';
 
 NR_INTCONSTANT: INTCONSTANT_frag;
 NR_IDENTIFIER: IDENTIFIER_frag;
diff --git a/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/TranslationUnit.java b/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/TranslationUnit.java
@@ -133,6 +133,12 @@ public void appendMain(ASTParser t, String statement) {
     appendMain(t.parseStatement(this, statement));
   }
 
+  public void ensureVersionStatement() {
+    if (versionStatement == null) {
+      setVersionStatement(VersionStatement.getDefault());
+    }
+  }
+
   @Override
   public <R> R accept(ASTVisitor<R> visitor) {
     return visitor.visitTranslationUnit(this);
diff --git a/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/Version.java b/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/Version.java
@@ -6,25 +6,25 @@
 import io.github.douira.glsl_transformer.ast.data.*;
 
 public enum Version implements TokenTyped {
-  GL20(GLSLLexer.NR_GL_110, 110),
-  GL21(GLSLLexer.NR_GL_120, 120),
-  GLES20(GLSLLexer.NR_GLES_100, 100, true),
-  GL30(GLSLLexer.NR_GL_130, 130),
-  GL31(GLSLLexer.NR_GL_140, 140),
-  GL32(GLSLLexer.NR_GL_150, 150),
-  GL33(GLSLLexer.NR_GL_330, 330),
-  GLES30(GLSLLexer.NR_GLES_300, 300, true),
-  GLES31(GLSLLexer.NR_GLES_310, 310, true),
-  GLES32(GLSLLexer.NR_GLES_320, 320, true),
-  GL40(GLSLLexer.NR_GL_400, 400),
-  GL41(GLSLLexer.NR_GL_410, 410),
-  GL42(GLSLLexer.NR_GL_420, 420),
-  GL43(GLSLLexer.NR_GL_430, 430),
-  GL44(GLSLLexer.NR_GL_440, 440),
-  GL45(GLSLLexer.NR_GL_450, 450),
-  GL46(GLSLLexer.NR_GL_460, 460);
-
-  public static Version latest = GL46;
+  GLSLES10(GLSLLexer.NR_GLSLES_100, 100, true),
+  GLSLES30(GLSLLexer.NR_GLSLES_300, 300, true),
+  GLSLES31(GLSLLexer.NR_GLSLES_310, 310, true),
+  GLSLES32(GLSLLexer.NR_GLSLES_320, 320, true),
+  GLSL11(GLSLLexer.NR_GLSL_110, 110),
+  GLSL12(GLSLLexer.NR_GLSL_120, 120),
+  GLSL13(GLSLLexer.NR_GLSL_130, 130),
+  GLSL14(GLSLLexer.NR_GLSL_140, 140),
+  GLSL15(GLSLLexer.NR_GLSL_150, 150),
+  GLSL33(GLSLLexer.NR_GLSL_330, 330),
+  GLSL40(GLSLLexer.NR_GLSL_400, 400),
+  GLSL41(GLSLLexer.NR_GLSL_410, 410),
+  GLSL42(GLSLLexer.NR_GLSL_420, 420),
+  GLSL43(GLSLLexer.NR_GLSL_430, 430),
+  GLSL44(GLSLLexer.NR_GLSL_440, 440),
+  GLSL45(GLSLLexer.NR_GLSL_450, 450),
+  GLSL46(GLSLLexer.NR_GLSL_460, 460);
+
+  public static Version latest = Version.GLSL46;
 
   public final int tokenType;
   public final int number;
diff --git a/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/VersionStatement.java b/glsl-transformer/src/main/java/io/github/douira/glsl_transformer/ast/node/VersionStatement.java
@@ -18,8 +18,8 @@ public VersionStatement(Version version, Profile profile) {
     this.profile = profile;
   }
 
-  public VersionStatement(Version version) {
-    this(version, Profile.CORE);
+  public static VersionStatement getDefault() {
+    return new VersionStatement(Version.GLSL11, null);
   }
 
   @Override
diff --git a/glsl-transformer/src/test/java/io/github/douira/glsl_transformer/ast/node/VersionStatementTest.java b/glsl-transformer/src/test/java/io/github/douira/glsl_transformer/ast/node/VersionStatementTest.java
@@ -0,0 +1,59 @@
+package io.github.douira.glsl_transformer.ast.node;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import io.github.douira.glsl_transformer.ast.query.Root;
+import io.github.douira.glsl_transformer.test_util.TestWithSingleASTTransformer;
+
+public class VersionStatementTest extends TestWithSingleASTTransformer {
+  @Test
+  void testMissingWithEnsure() {
+    Root.indexBuildSession(() -> {
+      var tu = p.parseTranslationUnit(";");
+      tu.ensureVersionStatement();
+      assertNotNull(tu.versionStatement);
+      assertNull(tu.versionStatement.profile);
+      assertEquals(Version.GLSL11, tu.versionStatement.version);
+    });
+  }
+
+  @Test
+  void testMissingVersionStatement() {
+    Root.indexBuildSession(() -> {
+      var tu = p.parseTranslationUnit(";");
+      assertNull(tu.versionStatement);
+    });
+  }
+
+  @Test
+  void testMissingProfile() {
+    Root.indexBuildSession(() -> {
+      var tu = p.parseTranslationUnit("#version 330\n;");
+      assertNotNull(tu.versionStatement);
+      assertNull(tu.versionStatement.profile);
+      assertEquals(Version.GLSL33, tu.versionStatement.version);
+    });
+  }
+
+  @Test
+  void testVersionWithProfile() {
+    Root.indexBuildSession(() -> {
+      var tu = p.parseTranslationUnit("#version 330 core\n;");
+      assertNotNull(tu.versionStatement);
+      assertEquals(Profile.CORE, tu.versionStatement.profile);
+      assertEquals(Version.GLSL33, tu.versionStatement.version);
+    });
+  }
+
+  @Test
+  void testVersionWithProfile2() {
+    Root.indexBuildSession(() -> {
+      var tu = p.parseTranslationUnit("#version 140 compatibility\n;");
+      assertNotNull(tu.versionStatement);
+      assertEquals(Profile.COMPATIBILITY, tu.versionStatement.profile);
+      assertEquals(Version.GLSL14, tu.versionStatement.version);
+    });
+  }
+}
diff --git a/glsl-transformer/src/test/java/io/github/douira/glsl_transformer/ast/transform/SingleASTTransformerTest.java b/glsl-transformer/src/test/java/io/github/douira/glsl_transformer/ast/transform/SingleASTTransformerTest.java
@@ -287,11 +287,11 @@ void testParseNewKeywords() {
       p.parseSeparateExternalDeclaration("void foo(sampler2D sample) { }");
     }, "It should throw if keywords are used as identifiers.");
     assertThrows(ParseCancellationException.class, () -> {
-      p.getLexer().version = Version.GL40;
+      p.getLexer().version = Version.GLSL40;
       p.parseSeparateExternalDeclaration("void foo(sampler2D sample) { }");
     }, "It should throw if keywords are used as identifiers.");
     assertDoesNotThrow(() -> {
-      p.getLexer().version = Version.GL33;
+      p.getLexer().version = Version.GLSL33;
       p.parseSeparateExternalDeclaration("void foo(sampler2D sample) { }");
     }, "It should not throw if disabled keywords are used as identifiers.");
   }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public VersionStatement(Version version, Profile profile) {`
`18`	`18`	`this.profile = profile;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public VersionStatement(Version version) {`
`22`		`- this(version, Profile.CORE);`
	`21`	`+ public static VersionStatement getDefault() {`
	`22`	`+ return new VersionStatement(Version.GLSL11, null);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`