transformer: IndexExpr

medvednikov · medvednikov · commit e9376a844222 · 2025-11-24T05:47:19.000+03:00
diff --git a/vlib/v/transformer/array.v b/vlib/v/transformer/array.v
@@ -8,7 +8,7 @@ import v.ast
 pub fn (mut t Transformer) array_init(mut node ast.ArrayInit) ast.Expr {
 	// For JS and Go generate array init using their syntax
 	// if t.pref.backend !in [.c, .native] {
-	if !t.pref.new_transform || node.is_fixed {
+	if !t.pref.new_transform || node.is_fixed { // || t.file.mod.name != 'main' {
 		for mut expr in node.exprs {
 			expr = t.expr(mut expr)
 		}
@@ -127,6 +127,72 @@ pub fn (mut t Transformer) array_init(mut node ast.ArrayInit) ast.Expr {
 	//}
 }
 
+pub fn (mut t Transformer) index_expr(mut node ast.IndexExpr) ast.Expr {
+	// if t.pref.new_transform {
+	// println(t.file.mod)
+	//}
+	t.check_safe_array(mut node)
+	node.left = t.expr(mut node.left)
+	node.index = t.expr(mut node.index)
+	node.or_expr = t.expr(mut node.or_expr) as ast.OrExpr
+	// if true { //!t.pref.new_transform { //|| t.file.mod.name != 'main' {
+	if !t.pref.new_transform { //|| t.file.mod.name != 'main' {
+		return node
+	}
+	// Recursively transform the left side (array/map) and the index
+	node.left = t.expr(mut node.left)
+	node.index = t.expr(mut node.index)
+	// Only apply transformation if	it is an array (not a fixed array, map, or option)
+	if node.is_array && !node.is_farray && !node.is_option && !node.is_map {
+		// Transformation: x[i] => (*(T*)builtin__array_get(x, i))
+		mut left_expr := node.left
+		mut left_type := node.left_type
+		// If the array is a pointer/reference (e.g. &[]int), we must dereference it
+		// because builtin__array_get expects the array struct by value.
+		if left_type.is_ptr() {
+			left_expr = ast.PrefixExpr{
+				op:    .mul
+				right: left_expr
+				pos:   node.pos
+			}
+			// The type of the argument becomes the value type (remove pointer)
+			left_type = left_type.set_nr_muls(0)
+		}
+		// Create the call: builtin__array_get(x, i)
+		call_expr := ast.CallExpr{
+			name:        'builtin__array_get'
+			mod:         'builtin'
+			args:        [
+				ast.CallArg{
+					expr: left_expr
+					typ:  left_type
+				},
+				ast.CallArg{
+					expr: node.index
+					typ:  ast.int_type
+				},
+			]
+			return_type: ast.voidptr_type
+		}
+		// Create the pointer type T* to cast the result (voidptr) to.
+		// node.typ is the element type T.
+		ptr_typ := node.typ.ref()
+		// Create the cast: (T*)builtin__array_get(...)
+		cast_expr := ast.CastExpr{
+			expr:    call_expr
+			typ:     ptr_typ
+			typname: t.table.get_type_name(ptr_typ)
+		}
+		// Dereference the result to get the element: *...
+		return ast.PrefixExpr{
+			op:    .mul
+			right: cast_expr
+			pos:   node.pos
+		}
+	}
+	return node
+}
+
 pub fn (mut t Transformer) find_new_array_len(node ast.AssignStmt) {
 	if !t.pref.is_prod {
 		return
diff --git a/vlib/v/transformer/transformer.v b/vlib/v/transformer/transformer.v
@@ -57,7 +57,6 @@ pub fn (mut t Transformer) transform(mut ast_file ast.File) {
 	}
 }
 
-
 pub fn (mut t Transformer) find_new_range(node ast.AssignStmt) {
 	if !t.pref.is_prod {
 		return
@@ -578,10 +577,7 @@ pub fn (mut t Transformer) expr(mut node ast.Expr) ast.Expr {
 			node.expr = t.expr(mut node.expr)
 		}
 		ast.IndexExpr {
-			t.check_safe_array(mut node)
-			node.left = t.expr(mut node.left)
-			node.index = t.expr(mut node.index)
-			node.or_expr = t.expr(mut node.or_expr) as ast.OrExpr
+			return t.index_expr(mut node)
 		}
 		ast.InfixExpr {
 			return t.infix_expr(mut node)
@@ -1120,7 +1116,6 @@ pub fn (mut t Transformer) infix_expr(mut node ast.InfixExpr) ast.Expr {
 	}
 }
 
-
 pub fn (mut t Transformer) if_expr(mut node ast.IfExpr) ast.Expr {
 	for mut branch in node.branches {
 		branch.cond = t.expr(mut branch.cond)

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ pub fn (mut t Transformer) transform(mut ast_file ast.File) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-`
`61`	`60`	`pub fn (mut t Transformer) find_new_range(node ast.AssignStmt) {`
`62`	`61`	`if !t.pref.is_prod {`
`63`	`62`	`return`
`@@ -578,10 +577,7 @@ pub fn (mut t Transformer) expr(mut node ast.Expr) ast.Expr {`
`578`	`577`	`node.expr = t.expr(mut node.expr)`
`579`	`578`	`}`
`580`	`579`	`ast.IndexExpr {`
`581`		`- t.check_safe_array(mut node)`
`582`		`- node.left = t.expr(mut node.left)`
`583`		`- node.index = t.expr(mut node.index)`
`584`		`- node.or_expr = t.expr(mut node.or_expr) as ast.OrExpr`
	`580`	`+ return t.index_expr(mut node)`
`585`	`581`	`}`
`586`	`582`	`ast.InfixExpr {`
`587`	`583`	`return t.infix_expr(mut node)`
`@@ -1120,7 +1116,6 @@ pub fn (mut t Transformer) infix_expr(mut node ast.InfixExpr) ast.Expr {`
`1120`	`1116`	`}`
`1121`	`1117`	`}`
`1122`	`1118`
`1123`		`-`
`1124`	`1119`	`pub fn (mut t Transformer) if_expr(mut node ast.IfExpr) ast.Expr {`
`1125`	`1120`	`for mut branch in node.branches {`
`1126`	`1121`	`branch.cond = t.expr(mut branch.cond)`