# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1342214211 25200
# Node ID f2cda2e6f70ebcf1f95c6f095515ecafab19e7fe
# Parent  18ab96287c3a59b5f9eb3d685a6eb76104ccc7fd
Fix os open to optionally take a file permission bit parameter. Update example to use this parameter. Add support for hex and binary integer literals

diff -r 18ab96287c3a -r f2cda2e6f70e cbackend.js
--- a/cbackend.js	Fri Jul 13 10:46:27 2012 -0700
+++ b/cbackend.js	Fri Jul 13 14:16:51 2012 -0700
@@ -582,12 +582,19 @@
 		]
 	});
 	os.addMessage('open', {
-		vars: {str: 'string *', flags: 'obj_int32 *', filedes: 'obj_int32 *'},
+		vars: {str: 'string *', flags: 'obj_int32 *', filedes: 'obj_int32 *', perm: 'obj_int32 *'},
 		lines: [
 			'str = va_arg(args, string *);',
 			'flags = va_arg(args, obj_int32 *);',
 			'filedes = make_object(&obj_int32_meta, NULL, 0);',
-			'filedes->num = open(str->data, flags->num);',
+			'if (num_params == 3) {',
+			'	filedes->num = open(str->data, flags->num);',
+			'} else if (num_params == 4) {',
+			'	perm = va_arg(args, obj_int32 *);',
+			'	filedes->num = open(str->data, flags->num, perm->num);',
+			'} else {',
+			'	filedes->num = -1;',
+			'}',
 			'return filedes;'
 		]
 	});
diff -r 18ab96287c3a -r f2cda2e6f70e parser.js
--- a/parser.js	Fri Jul 13 10:46:27 2012 -0700
+++ b/parser.js	Fri Jul 13 14:16:51 2012 -0700
@@ -77,9 +77,11 @@
 'opexpr = left:addsub pieces:(hws ("<=" / ">=" / "<" / ">" / "=") hws addsub)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+
 'addsub = left:muldiv pieces:(hws ("+"/"-"/".") hws muldiv)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+
 'muldiv = left:primlitsym pieces:(hws ("*"/"/") hws primlitsym)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+
-'primlitsym = hws val:(float / int / string / symbol / object / array / list / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' +
+'primlitsym = hws val:(float / hex / binary / int / string / symbol / object / array / list / lambda / "(" expr:expr hws ")" { return expr; }) { return val; };' +
 'symbol = chars:[a-zA-Z_!?@]+ trailing:(":"? [a-zA-Z_!?@0-9])* ! ":" { for (var i in trailing) { trailing[i] = trailing[i].join(""); } return new symbol(chars.join("") + trailing.join("")); };' +
 'float = digits:[0-9]+ "." decimals:[0-9]+ { return new floatlit(parseFloat(digits.join("") + "." + decimals.join(""))); };' +
+'binary = "0b" digits:[01]+ { return new intlit(parseInt(digits.join(""), 2)); };' +
+'hex = "0x" digits:[0-9a-fA-F]+ { return new intlit(parseInt(digits.join(""), 16)); };' +
 'int = digits:[0-9]+ { return new intlit(parseInt(digits.join(""), 10)); };' +
 'string = "\\"" text:(strpart/escape)* "\\"" { return new strlit(text.join("")); };' +
 'strpart = text:[^\\"\\\\]+ { return text.join(""); };' + 
diff -r 18ab96287c3a -r f2cda2e6f70e samples/osmod.tp
--- a/samples/osmod.tp	Fri Jul 13 10:46:27 2012 -0700
+++ b/samples/osmod.tp	Fri Jul 13 14:16:51 2012 -0700
@@ -3,7 +3,7 @@
 		os write: 1 "hello stdout via POSIX write\n"
 		name <- os read: 0 100
 		os write: 2 "hello " . name . " via stderr\n"
-		file <- os open: "output.txt" (os O_WRONLY) + (os O_CREAT) + (os O_TRUNC)
+		file <- os open: "output.txt" (os O_WRONLY) + (os O_CREAT) + (os O_TRUNC) 0b110110110
 		os write: file "hello file!\n"
 		os close: file
 		0