فهرست منبع

fix mega-stupid addClassPath macro bug

Simon Krajewski 8 سال پیش
والد
کامیت
19d6e46c3e
2فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 1 0
      extra/CHANGES.txt
  2. 1 1
      src/macro/macroApi.ml

+ 1 - 0
extra/CHANGES.txt

@@ -6,6 +6,7 @@ xxxx-xx-xx: 3.4.3
 	php7: fix using enum constructor with arguments as a call argument (#6177)
 	php/php7: fixed accessing enum constructors on enum type stored to a variable (#6159)
 	php: fix invoking functions stored in dynamic static vars (#6158)
+	macro : fixed bug in addClassPath that overwrites macro class paths with context class paths
 
 2017-03-20: 3.4.2
 

+ 1 - 1
src/macro/macroApi.ml

@@ -1750,7 +1750,7 @@ let macro_api ccom get_api =
 			com.class_path <- cp :: com.class_path;
 			(match com.get_macros() with
 			| Some(mcom) ->
-				mcom.class_path <- cp :: com.class_path;
+				mcom.class_path <- cp :: mcom.class_path;
 			| None ->
 				());
 			Hashtbl.clear com.file_lookup_cache;