C++: Autoformat.

geoffw0 · geoffw0 · commit ead5feb92138 · 2020-04-02T09:50:14.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Allocation.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Allocation.qll
@@ -226,7 +226,8 @@ class OperatorNewAllocationFunction extends AllocationFunction {
       hasGlobalName(name) and
       (
         // operator new(bytes, ...)
-        name = "operator new" or
+        name = "operator new"
+        or
         // operator new[](bytes, ...)
         name = "operator new[]"
       )
@@ -260,8 +261,7 @@ class CallAllocationExpr extends AllocationExpr, FunctionCall {
     not (
       exists(target.getReallocPtrArg()) and
       getArgument(target.getSizeArg()).getValue().toInt() = 0
-    )
-    and
+    ) and
     // these are modelled directly (and more accurately), avoid duplication
     not exists(NewOrNewArrayExpr new | new.getAllocatorCall() = this)
   }
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Deallocation.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Deallocation.qll
@@ -90,7 +90,8 @@ class OperatorDeleteDeallocationFunction extends DeallocationFunction {
       hasGlobalName(name) and
       (
         // operator delete(pointer, ...)
-        name = "operator delete" or
+        name = "operator delete"
+        or
         // operator delete[](pointer, ...)
         name = "operator delete[]"
       )

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,8 @@ class OperatorNewAllocationFunction extends AllocationFunction {`
`226`	`226`	`hasGlobalName(name) and`
`227`	`227`	`(`
`228`	`228`	`// operator new(bytes, ...)`
`229`		`- name = "operator new" or`
	`229`	`+ name = "operator new"`
	`230`	`+ or`
`230`	`231`	`// operator new[](bytes, ...)`
`231`	`232`	`name = "operator new[]"`
`232`	`233`	`)`
`@@ -260,8 +261,7 @@ class CallAllocationExpr extends AllocationExpr, FunctionCall {`
`260`	`261`	`not (`
`261`	`262`	`exists(target.getReallocPtrArg()) and`
`262`	`263`	`getArgument(target.getSizeArg()).getValue().toInt() = 0`
`263`		`- )`
`264`		`- and`
	`264`	`+ ) and`
`265`	`265`	`// these are modelled directly (and more accurately), avoid duplication`
`266`	`266`	`not exists(NewOrNewArrayExpr new \| new.getAllocatorCall() = this)`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ class OperatorDeleteDeallocationFunction extends DeallocationFunction {`
`90`	`90`	`hasGlobalName(name) and`
`91`	`91`	`(`
`92`	`92`	`// operator delete(pointer, ...)`
`93`		`- name = "operator delete" or`
	`93`	`+ name = "operator delete"`
	`94`	`+ or`
`94`	`95`	`// operator delete[](pointer, ...)`
`95`	`96`	`name = "operator delete[]"`
`96`	`97`	`)`