Update WebAssembly keywords to latest master.

src/EditLexers/stlWASM.c

@@ -6,21 +6,19 @@
 
 static KEYWORDLIST Keywords_WASM = {{
 //++Autogenerated -- start of section automatically generated
-"assert_exhaustion assert_invalid assert_malformed "
-"assert_return assert_return_arithmetic_nan assert_return_canonical_nan assert_return_func assert_trap assert_unlinkable "
-"binary data elem event export func get global import invoke local memory module mut offset param quote "
-"ref.host register result shared start table then type "
+"assert_exhaustion assert_invalid assert_malformed assert_return assert_trap assert_unlinkable binary data declare "
+"elem event export func get global import invoke item local memory module mut nan:arithmetic nan:canonical offset param "
+"quote ref.host register result shared start table then type "
 
 , // 1 type
-"anyfunc anyref f32 f32x4 f64 f64x2 funcref i16x8 i32 i32x4 i64 i64x2 i8x16 v128 "
+"anyfunc anyref f32 f32x4 f64 f64x2 funcref i16x8 i32 i32x4 i64 i64x2 i8x16 nullref v128 v16x8 v32x4 v64x2 v8x16 "
 
 , // 2 instruction
 "atomic.notify block br br_if br_on_exn br_table call call_indirect catch current_memory data.drop drop "
 "elem.drop else end get_global get_local global.get global.set grow_memory if local.get local.set local.tee loop "
 "memory.copy memory.fill memory.grow memory.init memory.size nop "
 "ref.func ref.is_null ref.null rethrow return return_call return_call_indirect select set_global set_local "
 "table.copy table.fill table.get table.grow table.init table.set table.size tee_local throw try unreachable "
-"v8x16.shuffle v8x16.swizzle "
 
 , // 3 full instruction
 "f32.abs f32.add f32.ceil f32.const f32.convert_i32_s f32.convert_i32_u f32.convert_i64_s f32.convert_i64_u f32.copysign "
@@ -30,13 +28,15 @@ static KEYWORDLIST Keywords_WASM = {{
 "f32x4.max f32x4.min f32x4.mul f32x4.ne f32x4.neg f32x4.replace_lane f32x4.splat f32x4.sqrt f32x4.sub f64.abs f64.add "
 "f64.ceil f64.const f64.convert_i32_s f64.convert_i32_u f64.convert_i64_s f64.convert_i64_u f64.copysign f64.div f64.eq "
 "f64.floor f64.ge f64.gt f64.le f64.load f64.lt f64.max f64.min f64.mul f64.ne f64.nearest f64.neg f64.promote_f32 "
-"f64.reinterpret_i64 f64.sqrt f64.store f64.sub f64.trunc f64x2.abs f64x2.add "
-"f64x2.convert_i64x2_s f64x2.convert_i64x2_u f64x2.div f64x2.eq f64x2.extract_lane f64x2.ge f64x2.gt f64x2.le f64x2.lt "
-"f64x2.max f64x2.min f64x2.mul f64x2.ne f64x2.neg f64x2.replace_lane f64x2.splat f64x2.sqrt f64x2.sub "
-"i16x8.add i16x8.add_saturate_s i16x8.add_saturate_u i16x8.all_true i16x8.any_true "
+"f64.reinterpret_i64 f64.sqrt f64.store f64.sub f64.trunc f64x2.abs f64x2.add f64x2.div f64x2.eq f64x2.extract_lane "
+"f64x2.ge f64x2.gt f64x2.le f64x2.lt f64x2.max f64x2.min f64x2.mul f64x2.ne f64x2.neg f64x2.replace_lane "
+"f64x2.splat f64x2.sqrt f64x2.sub "
+"i16x8.add i16x8.add_saturate_s i16x8.add_saturate_u i16x8.all_true i16x8.any_true i16x8.avgr_u "
 "i16x8.eq i16x8.extract_lane_s i16x8.extract_lane_u i16x8.ge_s i16x8.ge_u i16x8.gt_s i16x8.gt_u "
-"i16x8.le_s i16x8.le_u i16x8.load_splat i16x8.lt_s i16x8.lt_u i16x8.mul i16x8.ne i16x8.neg i16x8.replace_lane "
-"i16x8.shl i16x8.shr_s i16x8.shr_u i16x8.splat i16x8.sub i16x8.sub_saturate_s i16x8.sub_saturate_u i32.add i32.and "
+"i16x8.le_s i16x8.le_u i16x8.load8x8_s i16x8.load8x8_u i16x8.lt_s i16x8.lt_u "
+"i16x8.max_s i16x8.max_u i16x8.min_s i16x8.min_u i16x8.mul i16x8.narrow_i32x4_s i16x8.narrow_i32x4_u i16x8.ne i16x8.neg "
+"i16x8.replace_lane i16x8.shl i16x8.shr_s i16x8.shr_u i16x8.splat i16x8.sub i16x8.sub_saturate_s i16x8.sub_saturate_u "
+"i16x8.widen_high_i8x16_s i16x8.widen_high_i8x16_u i16x8.widen_low_i8x16_s i16x8.widen_low_i8x16_u i32.add i32.and "
 "i32.atomic.load i32.atomic.load16_u i32.atomic.load8_u i32.atomic.rmw.add i32.atomic.rmw.and i32.atomic.rmw.cmpxchg "
 "i32.atomic.rmw.or i32.atomic.rmw.sub i32.atomic.rmw.xchg i32.atomic.rmw.xor "
 "i32.atomic.rmw16.add_u i32.atomic.rmw16.and_u i32.atomic.rmw16.cmpxchg_u i32.atomic.rmw16.or_u i32.atomic.rmw16.sub_u "
@@ -50,8 +50,10 @@ static KEYWORDLIST Keywords_WASM = {{
 "i32.trunc_f32_s i32.trunc_f32_u i32.trunc_f64_s i32.trunc_f64_u "
 "i32.trunc_sat_f32_s i32.trunc_sat_f32_u i32.trunc_sat_f64_s i32.trunc_sat_f64_u i32.wrap_i64 i32.xor "
 "i32x4.add i32x4.all_true i32x4.any_true i32x4.eq i32x4.extract_lane i32x4.ge_s i32x4.ge_u i32x4.gt_s i32x4.gt_u "
-"i32x4.le_s i32x4.le_u i32x4.load_splat i32x4.lt_s i32x4.lt_u i32x4.mul i32x4.ne i32x4.neg i32x4.replace_lane "
-"i32x4.shl i32x4.shr_s i32x4.shr_u i32x4.splat i32x4.sub i32x4.trunc_sat_f32x4_s i32x4.trunc_sat_f32x4_u i64.add i64.and "
+"i32x4.le_s i32x4.le_u i32x4.load16x4_s i32x4.load16x4_u i32x4.lt_s i32x4.lt_u "
+"i32x4.max_s i32x4.max_u i32x4.min_s i32x4.min_u i32x4.mul i32x4.ne i32x4.neg i32x4.replace_lane "
+"i32x4.shl i32x4.shr_s i32x4.shr_u i32x4.splat i32x4.sub i32x4.trunc_sat_f32x4_s i32x4.trunc_sat_f32x4_u "
+"i32x4.widen_high_i16x8_s i32x4.widen_high_i16x8_u i32x4.widen_low_i16x8_s i32x4.widen_low_i16x8_u i64.add i64.and "
 "i64.atomic.load i64.atomic.load16_u i64.atomic.load32_u i64.atomic.load8_u i64.atomic.rmw.add i64.atomic.rmw.and "
 "i64.atomic.rmw.cmpxchg i64.atomic.rmw.or i64.atomic.rmw.sub i64.atomic.rmw.xchg i64.atomic.rmw.xor "
 "i64.atomic.rmw16.add_u i64.atomic.rmw16.and_u i64.atomic.rmw16.cmpxchg_u i64.atomic.rmw16.or_u i64.atomic.rmw16.sub_u "
@@ -66,14 +68,16 @@ static KEYWORDLIST Keywords_WASM = {{
 "i64.or i64.popcnt i64.reinterpret_f64 i64.rem_s i64.rem_u i64.rotl i64.rotr "
 "i64.shl i64.shr_s i64.shr_u i64.store i64.store16 i64.store32 i64.store8 i64.sub "
 "i64.trunc_f32_s i64.trunc_f32_u i64.trunc_f64_s i64.trunc_f64_u "
-"i64.trunc_sat_f32_s i64.trunc_sat_f32_u i64.trunc_sat_f64_s i64.trunc_sat_f64_u i64.xor "
-"i64x2.add i64x2.all_true i64x2.any_true i64x2.extract_lane i64x2.load_splat i64x2.neg i64x2.replace_lane "
-"i64x2.shl i64x2.shr_s i64x2.shr_u i64x2.splat i64x2.sub i64x2.trunc_sat_f64x2_s i64x2.trunc_sat_f64x2_u "
-"i8x16.add i8x16.add_saturate_s i8x16.add_saturate_u i8x16.all_true i8x16.any_true "
+"i64.trunc_sat_f32_s i64.trunc_sat_f32_u i64.trunc_sat_f64_s i64.trunc_sat_f64_u i64.xor i64x2.add i64x2.extract_lane "
+"i64x2.load32x2_s i64x2.load32x2_u i64x2.mul i64x2.neg i64x2.replace_lane "
+"i64x2.shl i64x2.shr_s i64x2.shr_u i64x2.splat i64x2.sub "
+"i8x16.add i8x16.add_saturate_s i8x16.add_saturate_u i8x16.all_true i8x16.any_true i8x16.avgr_u "
 "i8x16.eq i8x16.extract_lane_s i8x16.extract_lane_u i8x16.ge_s i8x16.ge_u i8x16.gt_s i8x16.gt_u "
-"i8x16.le_s i8x16.le_u i8x16.load_splat i8x16.lt_s i8x16.lt_u i8x16.mul i8x16.ne i8x16.neg i8x16.replace_lane "
+"i8x16.le_s i8x16.le_u i8x16.lt_s i8x16.lt_u i8x16.max_s i8x16.max_u i8x16.min_s i8x16.min_u "
+"i8x16.narrow_i16x8_s i8x16.narrow_i16x8_u i8x16.ne i8x16.neg i8x16.replace_lane "
 "i8x16.shl i8x16.shr_s i8x16.shr_u i8x16.splat i8x16.sub i8x16.sub_saturate_s i8x16.sub_saturate_u "
-"v128.and v128.bitselect v128.const v128.load v128.not v128.or v128.store v128.xor "
+"v128.and v128.andnot v128.bitselect v128.const v128.load v128.not v128.or v128.store v128.xor v16x8.load_splat "
+"v32x4.load_splat v64x2.load_splat v8x16.load_splat v8x16.shuffle v8x16.swizzle "
 
 , NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 //--Autogenerated -- end of section automatically generated

tools/KeywordCore.py

@@ -558,7 +558,10 @@ def parse_web_assembly_lexer_keywords(path):
 	}
 
 	types = ['i32', 'i64', 'f32', 'f64', 'v128',
-		'f32x4', 'f64x2', 'i16x8', 'i32x4', 'i64x2', 'i8x16']
+		'f32x4', 'f64x2',
+		'i8x16', 'i16x8', 'i32x4', 'i64x2',
+		'v8x16', 'v16x8', 'v32x4', 'v64x2',
+	]
 
 	def has_type_prefix(word):
 		return any(word.startswith(prefix + '.') for prefix in types)