Fix compile errors

renpy · Aug 14, 2024 · 046314a · 046314a
1 parent c16be13
commit 046314a
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 37 deletions.
diff --git a/src/tokenizer/debug-decorator.ts b/src/tokenizer/debug-decorator.ts
@@ -302,7 +302,7 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case KeywordTokenType.Camera:
             case KeywordTokenType.Show:
             case KeywordTokenType.Image:
-            case KeywordTokenType.LayeredImage:
+            case KeywordTokenType.Layeredimage:
             case KeywordTokenType.Window:
             case KeywordTokenType.Frame:
             case KeywordTokenType.Transform:
@@ -328,12 +328,17 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case KeywordTokenType.OtherPython:
             case KeywordTokenType.OtherAudio:
             case KeywordTokenType.Layer:
+            case KeywordTokenType.Always:
+            case KeywordTokenType.Group:
+            case KeywordTokenType.Attribute:
+            case KeywordTokenType.Nopredict:
             case KeywordTokenType.Take: // Renpy style sub-expression keywords
             case KeywordTokenType.Del:
             case KeywordTokenType.Clear:
             case KeywordTokenType.Variant:
             case KeywordTokenType.Vbox: // Renpy screen sub-expression keywords
             case KeywordTokenType.Hbox:
+            case KeywordTokenType.Fixed: // [52-73] Are control flow keywords
             case KeywordTokenType.Warp: // ATL keywords
             case KeywordTokenType.Circles:
             case KeywordTokenType.Clockwise:
@@ -359,6 +364,12 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
                 keywords.push(decoration);
                 break;
 
+            case KeywordTokenType.At: // Renpy control flow keywords
+            case KeywordTokenType.As:
+            case KeywordTokenType.With:
+            case KeywordTokenType.Onlayer:
+            case KeywordTokenType.Zorder:
+            case KeywordTokenType.Behind:
             case KeywordTokenType.If: // Conditional control flow keywords
             case KeywordTokenType.Elif:
             case KeywordTokenType.Else:
@@ -373,12 +384,6 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case KeywordTokenType.Parallel:
             case KeywordTokenType.Block:
             case KeywordTokenType.Choice:
-            case KeywordTokenType.At: // Renpy control flow keywords
-            case KeywordTokenType.As:
-            case KeywordTokenType.With:
-            case KeywordTokenType.Onlayer:
-            case KeywordTokenType.Zorder:
-            case KeywordTokenType.Behind:
                 controlKeywords.push(decoration);
                 break;
 
@@ -398,10 +403,13 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             // Variables
             case EntityTokenType.Identifier:
             case EntityTokenType.StyleName:
+            case EntityTokenType.TransformName:
             case EntityTokenType.ImageName:
             case EntityTokenType.TextName:
             case EntityTokenType.AudioName:
             case EntityTokenType.CharacterName:
+            case EntityTokenType.LayeredimageName:
+            case EntityTokenType.LanguageName:
             case EntityTokenType.PropertyName:
                 variables.push(decoration);
                 break;
@@ -428,6 +436,18 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.StringBegin:
             case MetaTokenType.StringEnd:
             case MetaTokenType.SimpleExpression:
+            case MetaTokenType.LayeredimageBlock:
+            case MetaTokenType.LayeredimageStatement:
+            case MetaTokenType.LayeredimageParameters:
+            case MetaTokenType.LayeredimageGroupStatement:
+            case MetaTokenType.LayeredimageGroupParameters:
+            case MetaTokenType.LayeredimageAttributeStatement:
+            case MetaTokenType.LayeredimageAttributeParameters:
+            case MetaTokenType.TranslateBlock:
+            case MetaTokenType.TranslateStatement:
+            case MetaTokenType.TranslateParameters:
+            case MetaTokenType.ScreenCall:
+            case MetaTokenType.RenpyBlock:
             case MetaTokenType.CodeBlock:
             case MetaTokenType.PythonLine:
             case MetaTokenType.PythonBlock:
@@ -442,13 +462,20 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.MenuBlock:
             case MetaTokenType.MenuOption:
             case MetaTokenType.MenuOptionBlock:
+            case MetaTokenType.LabelStatement:
+            case MetaTokenType.LabelCall:
+            case MetaTokenType.LabelAccess:
             case MetaTokenType.BehindStatement:
             case MetaTokenType.OnlayerStatement:
+            case MetaTokenType.ZorderStatement:
+            case MetaTokenType.AtStatement:
+            case MetaTokenType.AsStatement:
+            case MetaTokenType.WithStatement:
+            case MetaTokenType.ImageStatement:
             case MetaTokenType.CameraStatement:
             case MetaTokenType.SceneStatement:
             case MetaTokenType.ShowStatement:
             case MetaTokenType.HideStatement:
-            case MetaTokenType.ImageStatement:
             case MetaTokenType.CallStatement:
             case MetaTokenType.CallArguments:
             case MetaTokenType.FromClause:
@@ -457,16 +484,12 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.PlayAudioStatement:
             case MetaTokenType.QueueAudioStatement:
             case MetaTokenType.StopAudioStatement:
-            case MetaTokenType.LabelStatement:
-            case MetaTokenType.LabelCall:
-            case MetaTokenType.LabelAccess:
-            case MetaTokenType.AtStatement:
-            case MetaTokenType.AsStatement:
-            case MetaTokenType.WithStatement:
             case MetaTokenType.ScreenStatement:
             case MetaTokenType.ScreenSensitive:
             case MetaTokenType.ScreenFrame:
             case MetaTokenType.ScreenFrameStatement:
+            case MetaTokenType.ScreenFixed:
+            case MetaTokenType.ScreenFixedStatement:
             case MetaTokenType.ScreenWindow:
             case MetaTokenType.ScreenWindowStatement:
             case MetaTokenType.ScreenText:
@@ -509,7 +532,7 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.MemberAccess:
             case MetaTokenType.ItemAccess:
             case MetaTokenType.IndexedName:
-            case MetaTokenType.Attribute:
+            case MetaTokenType.DataAttribute:
             case MetaTokenType.ClassDefinition:
             case MetaTokenType.ClassInheritance:
             case MetaTokenType.FunctionDefinition:
@@ -648,6 +671,7 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case EscapedCharacterTokenType.EscBackslash:
             case EscapedCharacterTokenType.EscOpenSquareBracket:
             case EscapedCharacterTokenType.EscOpenBracket:
+            case EscapedCharacterTokenType.EscPercent:
                 escCharacters.push(decoration);
                 break;
 

diff --git a/src/tokenizer/python-token-patterns.g.ts b/src/tokenizer/python-token-patterns.g.ts
@@ -5,7 +5,7 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 07/08/2024 16:42:09 (UTC+0)
+// Last generated: 14/08/2024 09:13:39 (UTC+0)
 
 import { MetaTokenType, KeywordTokenType, CharacterTokenType, EntityTokenType, OperatorTokenType, LiteralTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -299,7 +299,7 @@ export const memberAccessAttribute: TokenPattern = {
     debugName: "memberAccessAttribute",
 
     // Highlight attribute access in otherwise non-specialized cases.
-    token: MetaTokenType.Attribute, /*variable.name.python meta.attribute.python*/
+    token: MetaTokenType.DataAttribute, /*variable.name.python meta.data.attribute.python*/
     match: /\b([a-zA-Z_]\w*)\b/g,
 };
 

diff --git a/src/tokenizer/renpy-token-patterns.g.ts b/src/tokenizer/renpy-token-patterns.g.ts
@@ -5,7 +5,7 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 07/08/2024 16:42:09 (UTC+0)
+// Last generated: 14/08/2024 09:13:39 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, LiteralTokenType, EntityTokenType, KeywordTokenType, EscapedCharacterTokenType, OperatorTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -394,7 +394,7 @@ export const escapedChar: TokenPattern = {
         5: { token: EscapedCharacterTokenType.EscBackslash, /*constant.character.escape.backslash.python.renpy*/ },
         6: { token: EscapedCharacterTokenType.EscOpenBracket, /*constant.character.escape.open.bracket.python.renpy*/ },
         7: { token: EscapedCharacterTokenType.EscOpenSquareBracket, /*constant.character.escape.open.square-bracket.python.renpy*/ },
-        8: { token: EscapedCharacterTokenType.EscAmpersand, /*constant.character.escape.ampersand.python.renpy*/ },
+        8: { token: EscapedCharacterTokenType.EscPercent, /*constant.character.escape.percent.python.renpy*/ },
     },
 };
 
@@ -788,7 +788,7 @@ export const stringTags: TokenPattern = {
                             match: /\b(jump)\b(:)([a-zA-Z_]\w*)/dg,
                             captures: {
                                 1: { token: KeywordTokenType.Jump, /*keyword.control.flow.jump.renpy*/ },
-                                2: { token: OperatorTokenType.Jump, /*punctuation.definition.jump.begin.renpy keyword.operator.jump.renpy*/ },
+                                2: { token: CharacterTokenType.Colon, /*keyword.operator.jump.renpy punctuation.colon.renpy*/ },
                                 3: { patterns: [fallbackPatterns] },
                             },
                         },
@@ -1411,7 +1411,7 @@ export const translate: TokenPattern = {
                     debugName: "translate.patterns![0].patterns![2]",
 
                     // Only the first word is the language name
-                    token: EntityTokenType.TranslateName, /*entity.name.type.translate.language.renpy*/
+                    token: EntityTokenType.LanguageName, /*entity.name.type.language.translate.renpy*/
                     match: /(?<=translate[ \t]+)\b([a-zA-Z_]\w*)\b/g,
                 },
                 fallbackPatterns,

diff --git a/src/tokenizer/renpy-tokens.ts b/src/tokenizer/renpy-tokens.ts
@@ -35,7 +35,7 @@ export const enum KeywordTokenType {
     Camera,
     Show,
     Image,
-    LayeredImage,
+    Layeredimage,
     Window,
     Frame,
     Transform,
@@ -65,6 +65,10 @@ export const enum KeywordTokenType {
     OtherPython,
     OtherAudio,
     Layer,
+    Always,
+    Group,
+    Attribute,
+    Nopredict,
 
     // Renpy style sub-expression keywords
     Take,
@@ -75,6 +79,7 @@ export const enum KeywordTokenType {
     // Renpy screen sub-expression keywords
     Vbox,
     Hbox,
+    Fixed,
 
     // Renpy control flow keywords
     At,
@@ -130,13 +135,16 @@ export const enum EntityTokenType {
     FunctionName,
     TagName,
     Identifier,
-    StyleName,
 
     // Renpy entities
+    StyleName,
+    TransformName,
     ImageName,
     TextName,
     AudioName,
     CharacterName,
+    LayeredimageName,
+    LanguageName,
 
     // ATL entities
     EventName,
@@ -265,6 +273,7 @@ export const enum EscapedCharacterTokenType {
     EscBackslash, // \\
     EscOpenSquareBracket, // [[
     EscOpenBracket, // {{
+    EscPercent, // %%
 }
 
 export const enum MetaTokenType {
@@ -287,6 +296,20 @@ export const enum MetaTokenType {
 
     SimpleExpression,
 
+    LayeredimageBlock,
+    LayeredimageStatement,
+    LayeredimageParameters,
+    LayeredimageGroupStatement,
+    LayeredimageGroupParameters,
+    LayeredimageAttributeStatement,
+    LayeredimageAttributeParameters,
+
+    TranslateBlock,
+    TranslateStatement,
+    TranslateParameters,
+
+    ScreenCall,
+
     RenpyBlock,
     CodeBlock,
     PythonLine,
@@ -336,6 +359,8 @@ export const enum MetaTokenType {
     ScreenSensitive,
     ScreenFrame,
     ScreenFrameStatement,
+    ScreenFixed,
+    ScreenFixedStatement,
     ScreenWindow,
     ScreenWindowStatement,
     ScreenText,
@@ -383,7 +408,7 @@ export const enum MetaTokenType {
     MemberAccess,
     ItemAccess,
     IndexedName,
-    Attribute,
+    DataAttribute,
     ClassDefinition,
     ClassInheritance,
     FunctionDefinition,