Bladeren bron

Update to work with "dofile("fname", raiserror, nowarnigs)".

mingodad 13 jaren geleden
bovenliggende
commit
5491cdf4fe
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      SquiLu-ourbiz/ourbiz-fltk.nut
  2. 1 1
      SquiLu-ourbiz/unify-code.nut

+ 1 - 1
SquiLu-ourbiz/ourbiz-fltk.nut

@@ -1094,7 +1094,7 @@ class Fl_Data_Table_Calendar extends Fl_Data_Table {
 
 dofile("search-options.nut");
 dofile("utils-fltk.nut");
-dofile("ourbiz-gui.nut");
+dofile("ourbiz-gui.nut", false, false);
 dofile("help-view.nut");
 dofile("fl-bar-chart.nut");
 dofile("calendar-utils.nut");

+ 1 - 1
SquiLu-ourbiz/unify-code.nut

@@ -8,7 +8,7 @@ function unify_code(fname){
 	local fc = fd.read(fd.len());
 	fd.close();
 	local last_pos = 0, start_pos = 0, end_pos = 0;
-	local result = fc.gsub("(dofile%(\"([^\"]+)\"%);)", function(m1, m2){
+	local result = fc.gsub("(dofile%(\"([^\"]+)\"[^)]*%);)", function(m1, m2){
 		print(m1, m2);
 		return format("dummy();//%s\n{\n%s\n}\n", m1, unify_code(m2));
 	});