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: 20e0e6935848
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: 7a00a4a47f2d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 15, 2015

  1. More friendly artiq.py2llvm.typing testbench.

    whitequark committed Jun 15, 2015
    Copy the full SHA
    a378986 View commit details
  2. Fix typo in a test.

    whitequark committed Jun 15, 2015
    Copy the full SHA
    7a00a4a View commit details
Showing with 4 additions and 3 deletions.
  1. +3 −2 artiq/py2llvm/typing.py
  2. +1 −1 lit-test/py2llvm/typing/unify.py
5 changes: 3 additions & 2 deletions artiq/py2llvm/typing.py
Original file line number Diff line number Diff line change
@@ -916,13 +916,14 @@ def process_diagnostic(diag):
else:
def process_diagnostic(diag):
print("\n".join(diag.render()))
if diag.level == 'fatal':
if diag.level in ('fatal', 'error'):
exit(1)

engine = diagnostic.Engine()
engine.process = process_diagnostic

buf = source.Buffer("".join(fileinput.input()), os.path.basename(fileinput.filename()))
buf = source.Buffer("".join(fileinput.input()).expandtabs(),
os.path.basename(fileinput.filename()))
parsed, comments = parse_buffer(buf, engine=engine)
typed = ASTTypedRewriter(engine=engine).visit(parsed)
Inferencer(engine=engine).visit(typed)
2 changes: 1 addition & 1 deletion lit-test/py2llvm/typing/unify.py
Original file line number Diff line number Diff line change
@@ -52,5 +52,5 @@
# CHECK-L: [x:int(width='j) for x:int(width='j) in [1:int(width='j)]:list(elt=int(width='j))]:list(elt=int(width='j))

lambda x, y=1: x
# CHECK-L: lambda x:'a, y:int(width='b)=1:int(width='b): x:'a:(x:'a, ?y:int(width='b))->'a
# CHECK-L: lambda x:'k, y:int(width='l)=1:int(width='l): x:'k:(x:'k, ?y:int(width='l))->'k