fix the ignorance of the second load of unnamed schema

starwing · starwing · commit 4301c410e663 · 2018-06-28T17:18:10.000+08:00
diff --git a/protoc.lua b/protoc.lua
@@ -737,8 +737,6 @@ local function make_context(self, lex)
 end
 
 function Parser:parse(src, name)
-   name = name or "<input>"
-
    local loaded = self.loaded[name]
    if loaded then
       if loaded == true then
@@ -747,7 +745,8 @@ function Parser:parse(src, name)
       return loaded
    end
 
-   local lex = Lexer.new(name or "<input>", src)
+   name = name or "<input>"
+   local lex = Lexer.new(name, src)
    local info = { name = lex.name }
    if name then self.loaded[name] = true end
    local ctx = make_context(self, lex)
diff --git a/test.lua b/test.lua
@@ -799,6 +799,17 @@ function _G.test_slice()
 end
 
 function _G.test_load()
+   do
+      local old = pb.state(nil)
+      protoc.reload()
+      local p = protoc.new()
+      assert(p:load [[ message Test1 { optional int32 t = 1; } ]])
+      assert(pb.type "Test1")
+      assert(p:load [[ message Test2 { optional int32 t = 2; } ]])
+      assert(pb.type "Test2")
+      pb.state(old)
+   end
+
    local old = pb.state(nil) -- discard previous one and save
    assert(old.setdefault)
    eq(pb.type ".google.protobuf.FileDescriptorSet", nil)
