Implement code generator

.gitignore

@@ -1,2 +1,4 @@
 *.pyc
 ipcdefs/cache
+*.cache
+node_modules/

idparser.py

@@ -26,21 +26,32 @@
 sname = /[a-zA-Z_][a-zA-Z0-9_:\-]*/ ;
 serviceNameList = @:','.{ sname } ;
 template = '<' @:','.{ expression } '>' ;
-structField = type [ name ] ';' ;
+structField = doc:{ comment }* type:type name:name ';' ;
 type =
-    | 'struct' '{' structFields:{ structField }+ '}'
+    | 'struct' [ template ] '{' structFields:{ structField }+ '}'
     | name:name template:[ template ]
     ;
 
-typeDef = 'type' name:name '=' type:type ';' ;
+typeDef = doc:{ comment }* 'type' name:name '=' type:type ';' ;
 
-interface = 'interface' name:name [ 'is' serviceNames:serviceNameList ] '{' functions:{ funcDef }* '}' ;
+interface = doc:{ comment }* 'interface' name:name [ 'is' serviceNames:serviceNameList ] '{' functions:{ funcDef }* '}' ;
 namedTuple = '(' @:','.{ type [ name ] } ')' ;
 namedType = type [ name ] ;
 comment = '#' line:/[^\\n]*/;
-funcDef = doc:{ comment }* '[' cmdId:number ']' name:name inputs:namedTuple [ '->' outputs:( namedType | namedTuple ) ] ';' ;
+range = [start:(number '.' number '.' number)] '-' [end:(number '.' number '.' number)] ;
+decorator = '@' @:decoratorType ;
+versionNumber = number '.' number '.' number ;
+decoratorType
+	=
+	| type:'version' '(' startVersion:versionNumber postfix:[('+' | '-' endVersion:versionNumber)] ')'
+	| type:'undocumented'
+	;
+
+funcDef = doc:{ comment }* decorators:{ decorator }* '[' cmdId:number ']' name:name inputs:namedTuple [ '->' outputs:( namedType | namedTuple ) ] ';' ;
 '''
 
+versionInfo = [ '1.0.0', '2.0.0', '2.1.0', '2.2.0', '2.3.0', '3.0.0', '3.0.1', '3.0.2', '4.0.0', '4.0.1', '4.1.0' ]
+
 class Semantics(object):
 	def number(self, ast):
 		if ast.startswith('0x'):
@@ -59,9 +70,9 @@ def parseType(type):
 	assert(not(type['template'] is not None and type['structFields'] is not None))
 	name, template, structFields = type['name'], type['template'], type['structFields']
 	if template is not None:
-		return [name] + map(parseType, template)
+		return [name] + list(map(parseType, template))
 	elif structFields is not None:
-		return ["struct"] + map(lambda x: [x[1], parseType(x[0])], structFields)
+		return ["struct"] + [list(map(lambda x: [x['name'], parseType(x['type']), list(map(lambda x: x.line, x['doc']))], structFields))]
 	else:
 		return [name]
 
@@ -81,18 +92,41 @@ def parse(data):
 		if 'functions' not in elem:
 			continue
 		#assert elem['name'] not in ifaces
-		ifaces[elem['name']] = iface = {}
+		ifaces[elem['name']] = iface = { "doc": "", "cmds": []}
 		if elem['serviceNames']:
 			services[elem['name']] = list(elem['serviceNames'])
-
+		iface['doc'] = "\n".join(map(lambda x: x.line, elem['doc']))
 		for func in elem['functions']:
 			if func['name'] in iface:
 				print >>sys.stderr, 'Duplicate function %s in %s' % (func['name'], elem['name'])
 				sys.exit(1)
 
 			assert func['name'] not in iface
-			iface[func['name']] = fdef = {}
+			fdef = {}
+			iface['cmds'].append(fdef)
+			fdef['name'] = func['name']
 			fdef['cmdId'] = func['cmdId']
+			fdef['undocumented'] = False
+
+			# Handle decorators
+			for decorator in func['decorators']:
+				if decorator['type'] == 'undocumented':
+					fdef['undocumented'] = True
+				elif decorator['type'] == 'version':
+					fdef['versionAdded'] = "".join(map(str, decorator['startVersion']))
+					if decorator['postfix'] is None:
+						fdef['lastVersion'] = fdef['versionAdded']
+					elif decorator['postfix'] == '+':
+						fdef['versionRemoved'] = None
+					else:
+						fdef['lastVersion'] = "".join(map(str, decorator['endVersion']))
+
+			# Set default values for "missing" decorators
+			if 'versionAdded' not in fdef:
+				fdef['versionAdded'] = "1.0.0"
+			if 'lastVersion' not in fdef:
+				fdef['lastVersion'] = None
+
 			fdef['doc'] = "\n".join(map(lambda x: x.line, func['doc']))
 			fdef['inputs'] = [(name, parseType(type)) for type, name in func['inputs']]
 			if func['outputs'] is None:
@@ -106,12 +140,14 @@ def parse(data):
 
 def getAll():
 	dir = os.path.dirname(os.path.realpath(__file__)) + '/'
-	fns = [dir + 'ipcdefs/auto.id'] + [x for x in glob.glob(dir + 'ipcdefs/*.id') if x != dir + 'ipcdefs/auto.id']
+	fns = [dir + 'ipcdefs/auto.id', dir + 'ipcdefs/switchbrew.id'] + [x for x in glob.glob(dir + 'ipcdefs/*.id') if x != dir + 'ipcdefs/auto.id' and x != dir + 'ipcdefs/switchbrew.id']
 
 	if os.path.exists(dir + 'ipcdefs/cache') and all(os.path.getmtime(dir + 'ipcdefs/cache') > os.path.getmtime(x) for x in fns):
-		res = json.load(file(dir + 'ipcdefs/cache'))
+		res = json.load(open(dir + 'ipcdefs/cache'))
 	else:
-		res = parse('\n'.join(file(fn).read() for fn in fns))
-		with file(dir + 'ipcdefs/cache', 'w') as fp:
+		res = parse('\n'.join(open(fn).read() for fn in fns))
+		with open(dir + 'ipcdefs/cache', 'w') as fp:
 			json.dump(res, fp)
+	# TODO: Check coherence. Especially of cmdId/version range (For each
+	# cmd ID, we need to make sure there is no version overlap !)
 	return res