parser: accept trailing comma in enums; __restrict for arrays

[m6w6/ext-psi] / psi.d / getopt.psi

diff --git a/psi.d/getopt.psi b/psi.d/getopt.psi
index fcf1db7c348523bd6a21f02eeb67bdcd8c4ce1fd..42b5ee5763d32564e4b016fe0a08665caf6a2332 100644 (file)
--- a/psi.d/getopt.psi
+++ b/psi.d/getopt.psi
@@ -1,33 +1,37 @@
+#include <getopt.h>
+
 function psi\opterr(int $value) : void {
-       let _v = intval($value);
-       return void(opterr_set);
+       let opterr = intval($value);
+       return opterr_set(opterr) as void(opterr_set);
 }
 function psi\optind\get() : int {
-       return to_int(optind_get);
+       return optind_get() as to_int(optind_get);
 }
 function psi\optind\set(int $v) : void {
-       let _v = intval($v);
-       return void(optind_set);
+       let optind = intval($v);
+       return optind_set(optind) as void(optind_set);
 }
 function psi\optopt() : int {
-       return to_int(optopt);
+       return optopt() as to_int(optopt);
 }
 function psi\optarg() : string {
-       return to_string(optarg);
+       return optarg() as to_string(optarg);
 }
-/* OSX
+
+#ifdef _OPTRESET
 function psi\optreset() : void {
        let _v = 1;
-       return void(optreset_set);
+       return optreset_set(_v) as void(optreset_set);
 }
-*/
+#endif
+
 static function psi\getopt(array &$argv, string $options) : int {
        let argc = count($argv);
        let argv = &arrval($argv,
                *argv = strval($argv)
        );
        let optstring = strval($options);
-       return to_int(getopt);
+       return getopt(argc, argv, optstring) as to_int(getopt);
        set $argv = to_array(
                *argv,
                argc,