From c1f2e774885610ef0307f953b1ba100e842b655f Mon Sep 17 00:00:00 2001
From: Slavomir <gagliardetto@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:11:55 +0300
Subject: [PATCH] Fix generated codeql

---
 ql/src/semmle/go/frameworks/stdlib/Bufio.qll | 43 ++++++++++----------
 ql/src/semmle/go/frameworks/stdlib/Bytes.qll | 37 ++++++++---------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/ql/src/semmle/go/frameworks/stdlib/Bufio.qll b/ql/src/semmle/go/frameworks/stdlib/Bufio.qll
index b4cb8b2519e..ade42ccc6fb 100644
--- a/ql/src/semmle/go/frameworks/stdlib/Bufio.qll
+++ b/ql/src/semmle/go/frameworks/stdlib/Bufio.qll
@@ -13,9 +13,11 @@ module Bufio {
     FunctionModels() {
       // signature: func NewReadWriter(r *Reader, w *Writer) *ReadWriter
       hasQualifiedName("bufio", "NewReadWriter") and
-      (inp.isParameter(0) and outp.isResult())
-      or
-      inp.isResult() and outp.isParameter(1)
+      (
+        inp.isParameter(0) and outp.isResult()
+        or
+        inp.isResult() and outp.isParameter(1)
+      )
       or
       // signature: func NewReader(rd io.Reader) *Reader
       hasQualifiedName("bufio", "NewReader") and
@@ -64,73 +66,72 @@ module Bufio {
     FunctionOutput outp;
 
     MethodModels() {
-      // Methods:
       // signature: func (*Reader).Peek(n int) ([]byte, error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "Peek") and
+      this.hasQualifiedName("bufio", "Reader", "Peek") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadByte() (byte, error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadByte") and
+      this.hasQualifiedName("bufio", "Reader", "ReadByte") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadBytes(delim byte) ([]byte, error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadBytes") and
+      this.hasQualifiedName("bufio", "Reader", "ReadBytes") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadLine() (line []byte, isPrefix bool, err error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadLine") and
+      this.hasQualifiedName("bufio", "Reader", "ReadLine") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadRune() (r rune, size int, err error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadRune") and
+      this.hasQualifiedName("bufio", "Reader", "ReadRune") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadSlice(delim byte) (line []byte, err error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadSlice") and
+      this.hasQualifiedName("bufio", "Reader", "ReadSlice") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadString(delim byte) (string, error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "ReadString") and
+      this.hasQualifiedName("bufio", "Reader", "ReadString") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).Reset(r io.Reader)
-      this.(Method).hasQualifiedName("bufio", "Reader", "Reset") and
+      this.hasQualifiedName("bufio", "Reader", "Reset") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Reader).WriteTo(w io.Writer) (n int64, err error)
-      this.(Method).hasQualifiedName("bufio", "Reader", "WriteTo") and
+      this.hasQualifiedName("bufio", "Reader", "WriteTo") and
       (inp.isReceiver() and outp.isParameter(0))
       or
       // signature: func (*Scanner).Bytes() []byte
-      this.(Method).hasQualifiedName("bufio", "Scanner", "Bytes") and
+      this.hasQualifiedName("bufio", "Scanner", "Bytes") and
       (inp.isReceiver() and outp.isResult())
       or
       // signature: func (*Scanner).Text() string
-      this.(Method).hasQualifiedName("bufio", "Scanner", "Text") and
+      this.hasQualifiedName("bufio", "Scanner", "Text") and
       (inp.isReceiver() and outp.isResult())
       or
       // signature: func (*Writer).ReadFrom(r io.Reader) (n int64, err error)
-      this.(Method).hasQualifiedName("bufio", "Writer", "ReadFrom") and
+      this.hasQualifiedName("bufio", "Writer", "ReadFrom") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Writer).Reset(w io.Writer)
-      this.(Method).hasQualifiedName("bufio", "Writer", "Reset") and
+      this.hasQualifiedName("bufio", "Writer", "Reset") and
       (inp.isReceiver() and outp.isParameter(0))
       or
       // signature: func (*Writer).Write(p []byte) (nn int, err error)
-      this.(Method).hasQualifiedName("bufio", "Writer", "Write") and
+      this.hasQualifiedName("bufio", "Writer", "Write") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Writer).WriteByte(c byte) error
-      this.(Method).hasQualifiedName("bufio", "Writer", "WriteByte") and
+      this.hasQualifiedName("bufio", "Writer", "WriteByte") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Writer).WriteRune(r rune) (size int, err error)
-      this.(Method).hasQualifiedName("bufio", "Writer", "WriteRune") and
+      this.hasQualifiedName("bufio", "Writer", "WriteRune") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Writer).WriteString(s string) (int, error)
-      this.(Method).hasQualifiedName("bufio", "Writer", "WriteString") and
+      this.hasQualifiedName("bufio", "Writer", "WriteString") and
       (inp.isParameter(0) and outp.isReceiver())
     }
 
diff --git a/ql/src/semmle/go/frameworks/stdlib/Bytes.qll b/ql/src/semmle/go/frameworks/stdlib/Bytes.qll
index 28bd4614501..56a677d1e09 100644
--- a/ql/src/semmle/go/frameworks/stdlib/Bytes.qll
+++ b/ql/src/semmle/go/frameworks/stdlib/Bytes.qll
@@ -150,77 +150,76 @@ module Bytes {
     FunctionOutput outp;
 
     MethodModels() {
-      // Methods:
       // signature: func (*Buffer).Bytes() []byte
-      this.(Method).hasQualifiedName("bytes", "Buffer", "Bytes") and
+      this.hasQualifiedName("bytes", "Buffer", "Bytes") and
       (inp.isReceiver() and outp.isResult())
       or
       // signature: func (*Buffer).Next(n int) []byte
-      this.(Method).hasQualifiedName("bytes", "Buffer", "Next") and
+      this.hasQualifiedName("bytes", "Buffer", "Next") and
       (inp.isReceiver() and outp.isResult())
       or
       // signature: func (*Buffer).ReadByte() (byte, error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "ReadByte") and
+      this.hasQualifiedName("bytes", "Buffer", "ReadByte") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Buffer).ReadBytes(delim byte) (line []byte, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "ReadBytes") and
+      this.hasQualifiedName("bytes", "Buffer", "ReadBytes") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Buffer).ReadFrom(r io.Reader) (n int64, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "ReadFrom") and
+      this.hasQualifiedName("bytes", "Buffer", "ReadFrom") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Buffer).ReadRune() (r rune, size int, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "ReadRune") and
+      this.hasQualifiedName("bytes", "Buffer", "ReadRune") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Buffer).ReadString(delim byte) (line string, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "ReadString") and
+      this.hasQualifiedName("bytes", "Buffer", "ReadString") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Buffer).String() string
-      this.(Method).hasQualifiedName("bytes", "Buffer", "String") and
+      this.hasQualifiedName("bytes", "Buffer", "String") and
       (inp.isReceiver() and outp.isResult())
       or
       // signature: func (*Buffer).Write(p []byte) (n int, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "Write") and
+      this.hasQualifiedName("bytes", "Buffer", "Write") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Buffer).WriteByte(c byte) error
-      this.(Method).hasQualifiedName("bytes", "Buffer", "WriteByte") and
+      this.hasQualifiedName("bytes", "Buffer", "WriteByte") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Buffer).WriteRune(r rune) (n int, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "WriteRune") and
+      this.hasQualifiedName("bytes", "Buffer", "WriteRune") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Buffer).WriteString(s string) (n int, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "WriteString") and
+      this.hasQualifiedName("bytes", "Buffer", "WriteString") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Buffer).WriteTo(w io.Writer) (n int64, err error)
-      this.(Method).hasQualifiedName("bytes", "Buffer", "WriteTo") and
+      this.hasQualifiedName("bytes", "Buffer", "WriteTo") and
       (inp.isReceiver() and outp.isParameter(0))
       or
       // signature: func (*Reader).ReadAt(b []byte, off int64) (n int, err error)
-      this.(Method).hasQualifiedName("bytes", "Reader", "ReadAt") and
+      this.hasQualifiedName("bytes", "Reader", "ReadAt") and
       (inp.isReceiver() and outp.isParameter(0))
       or
       // signature: func (*Reader).ReadByte() (byte, error)
-      this.(Method).hasQualifiedName("bytes", "Reader", "ReadByte") and
+      this.hasQualifiedName("bytes", "Reader", "ReadByte") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).ReadRune() (ch rune, size int, err error)
-      this.(Method).hasQualifiedName("bytes", "Reader", "ReadRune") and
+      this.hasQualifiedName("bytes", "Reader", "ReadRune") and
       (inp.isReceiver() and outp.isResult(0))
       or
       // signature: func (*Reader).Reset(b []byte)
-      this.(Method).hasQualifiedName("bytes", "Reader", "Reset") and
+      this.hasQualifiedName("bytes", "Reader", "Reset") and
       (inp.isParameter(0) and outp.isReceiver())
       or
       // signature: func (*Reader).WriteTo(w io.Writer) (n int64, err error)
-      this.(Method).hasQualifiedName("bytes", "Reader", "WriteTo") and
+      this.hasQualifiedName("bytes", "Reader", "WriteTo") and
       (inp.isReceiver() and outp.isParameter(0))
     }