Browse Source

Simplifying .type to recognized any types specified

sw23 3 years ago
parent
commit
2db4b4ef7f
2 changed files with 3 additions and 16 deletions
  1. 2 2
      src/pla/pla.test.ts
  2. 1 14
      src/pla/pla.ts

+ 2 - 2
src/pla/pla.test.ts

@@ -214,11 +214,11 @@ testTokenization('pla', [
 			]
 		},
 		{
-			line: '.type inval',
+			line: '.type other',
 			tokens: [
 				{ startIndex: 0, type: 'keyword.type.pla' },
 				{ startIndex: 5, type: '' },
-				{ startIndex: 6, type: 'invalid.pla' }
+				{ startIndex: 6, type: 'type.pla' }
 			]
 		}
 	],

+ 1 - 14
src/pla/pla.ts

@@ -54,8 +54,6 @@ export const language = <languages.IMonarchLanguage>{
 		'.end'
 	],
 
-	types: ['f', 'r', 'fd', 'fr', 'dr', 'fdr'],
-
 	// regular expressions
 	comment: /#.*$/,
 	identifier: /[a-zA-Z]+[a-zA-Z0-9_\-]*/,
@@ -94,18 +92,7 @@ export const language = <languages.IMonarchLanguage>{
 
 		whitespace: [[/[ \t\r\n]+/, '']],
 
-		type: [
-			{ include: '@whitespace' },
-			[
-				/\w+/,
-				{
-					cases: {
-						'@types': { token: 'type', next: '@pop' },
-						'@default': { token: 'invalid', next: '@pop' }
-					}
-				}
-			]
-		],
+		type: [{ include: '@whitespace' }, [/\w+/, { token: 'type', next: '@pop' }]],
 
 		keywordArg: [
 			// whitespace