Răsfoiți Sursa

[cs] Escape nested classes as well

Cauê Waneck 11 ani în urmă
părinte
comite
769835b7b3
1 a modificat fișierele cu 4 adăugiri și 0 ștergeri
  1. 4 0
      gencs.ml

+ 4 - 0
gencs.ml

@@ -2787,7 +2787,9 @@ let netpath_to_hx std = function
 		let ns = (List.map String.lowercase ns) in
 		let ns = (List.map String.lowercase ns) in
 		add_cs ns, netcl_to_hx cl
 		add_cs ns, netcl_to_hx cl
 	| ns,(nhd :: ntl as nested), cl ->
 	| ns,(nhd :: ntl as nested), cl ->
+		let nested = List.map (netcl_to_hx) nested in
 		let ns = (List.map String.lowercase ns) @ [nhd] in
 		let ns = (List.map String.lowercase ns) @ [nhd] in
+		let nhd = netcl_to_hx nhd in
 		add_cs ns, String.concat "_" nested ^ "_" ^ netcl_to_hx cl
 		add_cs ns, String.concat "_" nested ^ "_" ^ netcl_to_hx cl
 
 
 let lookup_ilclass std com ilpath =
 let lookup_ilclass std com ilpath =
@@ -2806,6 +2808,8 @@ let mk_type_path ctx path params =
 		| ns,[], cl ->
 		| ns,[], cl ->
 			ns, None, netcl_to_hx cl
 			ns, None, netcl_to_hx cl
 		| ns, (nhd :: ntl as nested), cl ->
 		| ns, (nhd :: ntl as nested), cl ->
+			let nhd = netcl_to_hx nhd in
+			let nested = List.map (netcl_to_hx) nested in
 			ns, Some (String.concat "_" nested ^ "_" ^ netcl_to_hx cl), nhd
 			ns, Some (String.concat "_" nested ^ "_" ^ netcl_to_hx cl), nhd
 	in
 	in
   CTPath {
   CTPath {