Implement generator.throw() #369

m4ns0ur · 2017-07-23T19:33:42Z

No description provided.

m4ns0ur · 2017-07-23T19:36:38Z

compiler/expr_visitor.py

@@ -379,6 +379,10 @@ def visit_Yield(self, node):
    self.writer.write('return {}, nil'.format(value.expr))
    self.writer.write_label(resume_label)
    result = self.block.alloc_temp()
+    self.writer.write(textwrap.dedent("""\


@trotterdylan not sure if try/except block is able to catch this

I think you want to do:

if πRaised != nil { πE = πRaised πRaised = nil if πE != nil { continue } }

You could also merge the write() call below into this:

self.writer.write_tmpl(textwrap.dedent("""\ if πRaised != nil { \tπE = πRaised \tπRaised = nil \tif πE != nil { \t\tcontinue \t} } $result = πSent"""), result=result.name)

m4ns0ur · 2017-07-23T19:37:54Z

runtime/generator.go

-			raised = f.RaiseType(TypeErrorType, "can't send non-None value to a just-started generator")
-		} else {
+func (g *Generator) resume(f *Frame, sendValue *Object, raisedValue *BaseException) (*Object, *BaseException) {
+	if raisedValue == nil {


@trotterdylan do we still need to update g.state while having throw?

Yes, I think you can remove this check and update g.state normally for throw.

m4ns0ur · 2017-07-23T19:43:23Z

@trotterdylan what is the best approach to test stmt and expr_visitor? could you give me a hint?

trotterdylan

edit: sorry, accidentally submitted before I was finished

Thinking about this some more, maybe it's better to test in testing/generator_test.py instead of trying to do this in a stmt_test.py.

trotterdylan · 2017-07-26T04:17:30Z

compiler/stmt.py

@@ -590,9 +590,14 @@ def visit_function_inline(self, node):
        self.writer.write('var πE *πg.BaseException; _ = πE')
        if func_block.is_generator:
          self.writer.write(
-              'return πg.NewGenerator(πF, func(πSent *πg.Object) '
+              'return πg.NewGenerator(πF, '
+              'func(πSent *πg.Object, πRaised *πg.BaseException) '


Maybe call it πThrown

trotterdylan · 2017-07-26T04:22:01Z

compiler/expr_visitor.py

@@ -379,6 +379,10 @@ def visit_Yield(self, node):
    self.writer.write('return {}, nil'.format(value.expr))
    self.writer.write_label(resume_label)
    result = self.block.alloc_temp()
+    self.writer.write(textwrap.dedent("""\


I think you want to do:

if πRaised != nil { πE = πRaised πRaised = nil if πE != nil { continue } }

You could also merge the write() call below into this:

self.writer.write_tmpl(textwrap.dedent("""\ if πRaised != nil { \tπE = πRaised \tπRaised = nil \tif πE != nil { \t\tcontinue \t} } $result = πSent"""), result=result.name)

trotterdylan · 2017-07-26T04:35:25Z

runtime/generator.go

+
+func generatorThrow(f *Frame, args Args, _ KWArgs) (*Object, *BaseException) {
+	argc := len(args)
+	if argc == 1 {


You can leave out the argc == 1 and argc > 4 checks here. If argc < 2 || argc > 4 then the checkMethodArgs will fail because it won't match expectedTypes. The error message isn't ideal in that case, but I think the simplicity warrants it.

trotterdylan · 2017-07-26T04:39:39Z

runtime/generator.go

-			raised = f.RaiseType(TypeErrorType, "can't send non-None value to a just-started generator")
-		} else {
+func (g *Generator) resume(f *Frame, sendValue *Object, raisedValue *BaseException) (*Object, *BaseException) {
+	if raisedValue == nil {


Yes, I think you can remove this check and update g.state normally for throw.

m4ns0ur · 2017-07-26T23:12:56Z

@trotterdylan generator cannot catch the thrown exception, I should check more.

m4ns0ur · 2017-08-24T21:19:05Z

@trotterdylan sorry for the long delay.

so the problem is generator cannot catch the thrown exception.
here is the CPython code (in generator test):

def gen8():
  try:
    yield
  except ValueError as e:
    assert "foo" in str(e)
    yield
  else:
    raise AssertionError
g = gen8()
g.next()
g.throw(ValueError, 'foo')

and Grumpy generated code:

.
.
.
for ; πF.State() >= 0; πF.PopCheckpoint() {
	switch πF.State() {
	case 0:
	case 2: goto Label2
	case 3: goto Label3
	case 5: goto Label5
	default: panic("unexpected function state")
	}
	// line 2: try:
	πF.SetLineno(2)
	πF.PushCheckpoint(2)
	// line 3: yield
	πF.SetLineno(3)
	πF.PushCheckpoint(3)
	return πg.None, nil
Label3:
	if πThrown != nil {
		πE = πThrown
		πThrown = nil
		if πE != nil {
			continue
		}
	}
	πTemp001 = πSent
	πF.PopCheckpoint()
	if πTemp001, πE = πg.ResolveGlobal(πF, ßAssertionError); πE != nil {
		continue
	}
	// line 8: raise AssertionError
	πF.SetLineno(8)
	πE = πF.Raise(πTemp001, nil, nil)
	continue
	goto Label1
Label2:
	if πE == nil {
	  continue
	}
	πE = nil
	πTemp002, πTemp003 = πF.ExcInfo()
	if πTemp001, πE = πg.ResolveGlobal(πF, ßValueError); πE != nil {
		continue
	}
	if πTemp004, πE = πg.IsInstance(πF, πTemp002.ToObject(), πTemp001); πE != nil {
		continue
	}
	if πTemp004 {
		goto Label4
	}
	πE = πF.Raise(πTemp002.ToObject(), nil, πTemp003.ToObject())
	continue
	// line 4: except ValueError as e:
	πF.SetLineno(4)
Label4:
	µe = πTemp002.ToObject()
	// line 5: assert "foo" in str(e)
	πF.SetLineno(5)
	πTemp005 = πF.MakeArgs(1)
	if πE = πg.CheckLocal(πF, µe, "e"); πE != nil {
		continue
	}
	πTemp005[0] = µe
	if πTemp006, πE = πg.ResolveGlobal(πF, ßstr); πE != nil {
		continue
	}
	if πTemp007, πE = πTemp006.Call(πF, πTemp005, nil); πE != nil {
		continue
	}
	πF.FreeArgs(πTemp005)
	if πTemp004, πE = πg.Contains(πF, πTemp007, ßfoo.ToObject()); πE != nil {
		continue
	}
	πTemp001 = πg.GetBool(πTemp004).ToObject()
	if πE = πg.Assert(πF, πTemp001, nil); πE != nil {
		continue
	}
	// line 6: yield
	πF.SetLineno(6)
	πF.PushCheckpoint(5)
	return πg.None, nil
Label5:
	if πThrown != nil {
		πE = πThrown
		πThrown = nil
		if πE != nil {
			continue
		}
	}
	πTemp001 = πSent
	πF.RestoreExc(nil, nil)
	goto Label1
Label1:
}
.
.
.

it seems OK to me, do you see anything improper?

Implement generator.throw()

a5b9dc9

m4ns0ur commented Jul 23, 2017

View reviewed changes

trotterdylan reviewed Jul 26, 2017

View reviewed changes

Some fixes on generator.throw()

15f1f74

m4ns0ur changed the title ~~[WIP] Implement generator.throw()~~ Implement generator.throw() Jul 26, 2017

Remove extra writer in visit_yield

bb52e79

m4ns0ur closed this Nov 22, 2017

m4ns0ur reopened this Nov 22, 2017

This was referenced Oct 6, 2018

Implement generator.throw() grumpyhome/grumpy#91

Open

Migrate google/grumpy issues to grumpyhome/grumpy grumpyhome/grumpy#8

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement generator.throw() #369

Implement generator.throw() #369

m4ns0ur commented Jul 23, 2017

m4ns0ur Jul 23, 2017

trotterdylan Jul 26, 2017

m4ns0ur Jul 23, 2017

trotterdylan Jul 26, 2017

m4ns0ur commented Jul 23, 2017

trotterdylan left a comment •

edited

Loading

trotterdylan Jul 26, 2017

trotterdylan Jul 26, 2017

trotterdylan Jul 26, 2017

trotterdylan Jul 26, 2017

m4ns0ur commented Jul 26, 2017 •

edited

Loading

m4ns0ur commented Aug 24, 2017

Implement generator.throw() #369

Are you sure you want to change the base?

Implement generator.throw() #369

Conversation

m4ns0ur commented Jul 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

m4ns0ur commented Jul 23, 2017

trotterdylan left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

m4ns0ur commented Jul 26, 2017 • edited Loading

m4ns0ur commented Aug 24, 2017

trotterdylan left a comment •

edited

Loading

m4ns0ur commented Jul 26, 2017 •

edited

Loading