Skip to content

Typechecking bei der Initialisierung von Records #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skogsbaer merged 3 commits into from
Sep 24, 2021
Merged

Typechecking bei der Initialisierung von Records #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
486999b
set __file__ for user module for displaying source code in type error…
Sep 23, 2021
adf8e41
Merge pull request #1 from CodeSteak/untypy
CodeSteak Sep 23, 2021
4dea775
do not check for eq of absolute file paths
Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion python/integration-tests/testIntegration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import shell
import unittest
import os
import re

def run(path, input='', tycheck=True, ecode=0):
flags = ['--quiet', '--no-clear']
Expand Down Expand Up @@ -30,6 +31,11 @@ def stripTrailingWs(s):
s = s.strip()
return '\n'.join([l.rstrip() for l in s.split('\n')])

def removeFilePaths(s):
s = re.sub(r"declared at: .*", '<omitted>', s)
s = re.sub(r"caused by: .*", '<omitted>', s)
return s

LOG_FILE = shell.mkTempFile(prefix="wypp-tests", suffix=".log", deleteAtExit='ifSuccess')
print(f'Output of integration tests goes to {LOG_FILE}')
LOG_REDIR = f'>> {LOG_FILE} 2>&1'
Expand Down Expand Up @@ -145,7 +151,7 @@ def test_types2(self):
2 | return x + 1

caused by: <console>:1"""
self.assertEqual(expected, out)
self.assertEqual(removeFilePaths(expected), removeFilePaths(out))

def test_types3(self):
out = runInteractive('test-data/testTypesInteractive.py',
Expand Down
3 changes: 3 additions & 0 deletions python/src/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ def __exit__(self, exc_type, value, traceback):

def runCode(fileToRun, globals, args, useUntypy=True):
localDir = os.path.dirname(fileToRun)
fileToRun = os.path.realpath(fileToRun) # needed for setting __file__
with sysPathPrepended(localDir):
with open(fileToRun) as f:
flags = 0 | anns.compiler_flag
Expand All @@ -285,6 +286,8 @@ def runCode(fileToRun, globals, args, useUntypy=True):
oldArgs = sys.argv
try:
sys.argv = [fileToRun] + args
# set modules globals
globals['__file__'] = fileToRun
exec(compiledCode, globals)
finally:
sys.argv = oldArgs
Expand Down