Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2543daa5cfbb
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9bb5fba6a1d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 19, 2015

  1. lit-test: fix inferencer/error_class test (broken in b0c6b70).

    whitequark committed Nov 19, 2015
    Copy the full SHA
    a04d0f8 View commit details

  2. lit-test: fix iodelay/class test (broken in 506725f).

    whitequark committed Nov 19, 2015
    Copy the full SHA
    b9bb5fb View commit details
Showing with 9 additions and 7 deletions.
  1. +0 −6 lit-test/test/inferencer/error_class.py
  2. +8 −0 lit-test/test/inferencer/error_class_redefine.py
  3. +1 −1 lit-test/test/iodelay/class.py
6 changes: 0 additions & 6 deletions lit-test/test/inferencer/error_class.py
View file
Original file line number Diff line number Diff line change
@@ -8,9 +8,3 @@ class a(1):
class b:
# CHECK-L: ${LINE:+1}: fatal: class body must contain only assignments and function definitions
x += 1

class c:
pass
# CHECK-L: ${LINE:+1}: fatal: variable 'c' is already defined
class c:
pass
8 changes: 8 additions & 0 deletions lit-test/test/inferencer/error_class_redefine.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# RUN: %python -m artiq.compiler.testbench.inferencer +diag %s >%t
# RUN: OutputCheck %s --file-to-check=%t

class c:
pass
# CHECK-L: ${LINE:+1}: fatal: variable 'c' is already defined
class c:
pass
2 changes: 1 addition & 1 deletion lit-test/test/iodelay/class.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# RUN: %python -m artiq.compiler.testbench.signature %s >%t
# RUN: OutputCheck %s --file-to-check=%t

# CHECK-L: g: ()->NoneType delay(s->mu(1.0) mu)
# CHECK-L: g: (i:<instance c {}>)->NoneType delay(s->mu(1.0) mu)
def g(i):
i.f(1.0)