whitespace

src/analysis/m3/LearnPrettyPrinter.rsc

@@ -24,7 +24,7 @@ void generateFormatterForC() {
 
 @synopsis{Takes a corpus of example files and an (external) parser for the given language and produces a pretty printing function as Rascal code.}
 @description{
-If the external parser satisfies the specification in ((analysis::m3::AST)) then this function will learn a basic
+If the external parser satisfies the specification in `analysis::m3::AST` then this function will learn a basic
 `unparser` (a.k.a. pretty printer) from the corpus of files. 
 
 The code that is generated is Rascal code which can be expanded into a module that imports the right AST format, and nothing else.
@@ -142,4 +142,4 @@ str escape(str s) = visit("<[s]>"[2..-2]) {
 };
 
 @synopsis{Waiting for `node.src` to be available in Rascal for good...}
-loc \loc(node n) = l when loc l := n.src;
+loc \loc(node n) = l when loc l := n.src;

src/lang/cpp/AST.rsc

@@ -15,6 +15,9 @@ module lang::cpp::AST
 
 import lang::cpp::TypeSymbol;
 
+// TODO: this should not be used in AST positions, but it is.
+data TypeSymbol;
+
 data Declarator(list[Attribute] attributes = [], loc src = |unknown:///|, loc decl = |unknown:///|, bool isMacroExpansion = false)
     = \declarator(list[Declaration] pointerOperators, Name name)
     | \declarator(list[Declaration] pointerOperators, Name name, Expression initializer)

src/lang/cpp/internal/Parser.java

@@ -579,13 +579,15 @@ public ISet getMacroExpansionsFromTranslationUnit(IASTTranslationUnit tu) {
 	}
 
 	private void addDeclaredType(ISourceLocation decl, IConstructor typ) {
-		if (toM3)
+		if (toM3) {
 			declaredType.insert(vf.tuple(decl, typ));
+		}	
 	}
 
 	private void addFunctionDefinition(ISourceLocation decl, ISourceLocation loc) {
-		if (toM3)
+		if (toM3) {
 			functionDefinitions.insert(vf.tuple(decl, loc));
+		}
 	}
 
 	public ISet parseForMacros(ISourceLocation file, IList includePath, IMap standardMacros, IMap additionalMacros) {
@@ -1247,6 +1249,7 @@ else if (definition instanceof ICPPASTFunctionWithTryBlock) {
 			stack.push(builder.Declaration_functionDefinition(declSpecifier, declarator, vf.listWriter().done(),
 					stack.pop(), vf.listWriter().done(), loc, isMacroExpansion));
 		}
+
 		addDeclaredType(br.resolveBinding(definition.getDeclarator(), locs.forNode(definition.getDeclarator())), tr.resolveType(definition.getDeclarator()));
 		addFunctionDefinition(br.resolveBinding(definition.getDeclarator(), loc), loc);
 		return PROCESS_ABORT;