bhl.inc.php

@@ -156,9 +156,11 @@ function bhl_run(bool $debug = true, bool $force = false, bool $exit_on_err = tr
       if(!$exit_on_err)
         return false;
     }
-    else if($debug)
+    else
       echo "BHL BUNDLE: total " . kb_len(filesize($result_file)) . ", CRC " . hexdec(hash_file('CRC32', $result_file, false)) . "\n"; 
   }
+
+  @touch($result_file);
 }
 
 function bhl_handle_error_result(array $ret_out, string $err_file, bool $exit = true)
@@ -267,25 +269,24 @@ function bhl_validate_func_ref(string $module_file, string $func_full_name, arra
   if(!$module_src)
     throw new Exception("Bad module file '{$module_file}'");
 
-  $ns_chunks = _bhl_split_by_namespaces($module_src);
-
   $module_chunks = array();
   if($namespace)
   {
-    if(!isset($ns_chunks[$namespace]))
+    $ns_chunks = _bhl_split_by_namespaces($module_src);
-      throw new Exception("No namespace '$namespace' found in '$module_file'");
+    if(count($ns_chunks) == 0)
+      throw new Exception("No namespaces found in '$module_file'");
 
-    foreach($ns_chunks[$namespace] as $ns_src)
+    foreach($ns_chunks as $ns => $ns_src)
-      $module_chunks[] = $ns_src;
+    {
+      if($ns === $namespace)
+        $module_chunks[] = $ns_src;
+    }
+
+    if(count($module_chunks) == 0)
+      throw new Exception("Namespace '$namespace' for func '$func_full_name' not found in '$module_file'");
   }
   else
-  {
+    $module_chunks[] = $module_src;
-    if(!isset($ns_chunks['']))
-      throw new Exception("No global namespace found in '$module_file'");
-
-    foreach($ns_chunks[''] as $ns_src)
-      $module_chunks[] = $ns_src;
-  }
 
   $signature_pattern = '';
   $signature_pattern .= '~func\s+';
@@ -347,18 +348,11 @@ function _bhl_split_by_namespaces(string $src) : array
     {
       $ns = trim(substr(ltrim($chunk), 9));
       $body = $chunks[$i+1];
-      if(!isset($nss[$ns]))
+      $nss[$ns] = $body;
-        $nss[$ns] = array();
-      $nss[$ns][] = $body;
       $i+=2;
     }
     else
-    {
-      if(!isset($nss['']))
-        $nss[''] = array();
-      $nss[''][] = $chunk;
       ++$i;
-    }
   }
 
   return $nss;

bhl_flt.inc.php

@@ -2,7 +2,7 @@
 namespace metagen_php;
 use Exception;
 
-function flt_bhl_ref($val, $name, $data, $str_args)
+function flt_bhl_ref($val, $name, $struct, $str_args)
 {
   if(!$val)
     return $val;