diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2013-01-29 13:46:56 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2013-02-03 21:08:34 +0100 |
commit | b74c33eb860622e3630949ee0eeac9c15e8df166 (patch) | |
tree | c5f80cbe5d5a552bd1bb8efeb6f3b8b1499b0e2e /test/files/neg/t6829.check | |
parent | a06d31f6a2df021acc18b10ad9cad0f80d7498f2 (diff) | |
download | scala-b74c33eb860622e3630949ee0eeac9c15e8df166.tar.gz scala-b74c33eb860622e3630949ee0eeac9c15e8df166.tar.bz2 scala-b74c33eb860622e3630949ee0eeac9c15e8df166.zip |
SI-1803, plus documentation and cleanups in Namers, mainly in typeSig
- when typing (and naming) a ValDef, tpt and rhs are now type checked
in the same context (the inner / ValDef context). this does not change
any behavior, but is more uniform (same as for DefDef). martin told me
(offline) that this change is desirable if it doesn't break anything.
(it doesn't).
- typeSig is now more uniform with a separate method for each case
(methodSig, valDefSig, etc). methodSig was cleaned up (no more variables)
and documented. the type returned by methodSig no longer contains /
refers to type skolems, but to the actual type parameters (so we don't
need to replace the skolems lateron).
- documentation on constructor contexts, type skolems
- more tests for SI-5543
Diffstat (limited to 'test/files/neg/t6829.check')
-rw-r--r-- | test/files/neg/t6829.check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t6829.check b/test/files/neg/t6829.check index 8ee6d182eb..7c3c66e0f2 100644 --- a/test/files/neg/t6829.check +++ b/test/files/neg/t6829.check @@ -1,6 +1,6 @@ t6829.scala:35: error: type mismatch; found : AgentSimulation.this.state.type (with underlying type G#State) - required: _10.State + required: _9.State lazy val actions: Map[G#Agent,G#Action] = agents.map(a => a -> a.chooseAction(state)).toMap ^ t6829.scala:45: error: trait AgentSimulation takes type parameters @@ -17,12 +17,12 @@ t6829.scala:49: error: not found: value nextState ^ t6829.scala:50: error: type mismatch; found : s.type (with underlying type Any) - required: _54.State where val _54: G + required: _53.State where val _53: G val r = rewards(agent).r(s,a,s2) ^ t6829.scala:51: error: type mismatch; found : s.type (with underlying type Any) - required: _51.State + required: _50.State agent.learn(s,a,s2,r): G#Agent ^ t6829.scala:53: error: not found: value nextState |