Skip to content

Commit

Permalink
Merge #330
Browse files Browse the repository at this point in the history 
330: Update Submodules r=viper-admin a=viper-admin

* Updates Gobra from `2e8205a89b2352ce63140fa63c138adc22e74689` to `61d0bd916d5c1b183110976e517303ca8ab88289`.

Co-authored-by: ArquintL <[email protected]>
  • Loading branch information
@bors @ArquintL
bors[bot] and ArquintL authored Oct 4, 2023
2 parents 47f83f6 + 0ee0357 commit 6613283
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/gobra
Submodule gobra updated 45 files
+1 −1 build.sbt
+3 −1 src/main/antlr4/GobraParser.g4
+319 −315 src/main/java/viper/gobra/frontend/GobraLexer.java
+2,548 −2,494 src/main/java/viper/gobra/frontend/GobraParser.java
+8 −1 src/main/java/viper/gobra/frontend/GobraParserBaseVisitor.java
+7 −1 src/main/java/viper/gobra/frontend/GobraParserVisitor.java
+1 −0 src/main/scala/viper/gobra/ast/frontend/AstPattern.scala
+6 −1 src/main/scala/viper/gobra/ast/internal/PrettyPrinter.scala
+15 −52 src/main/scala/viper/gobra/ast/internal/Program.scala
+114 −128 src/main/scala/viper/gobra/frontend/Desugar.scala
+34 −19 src/main/scala/viper/gobra/frontend/ParseTreeTranslator.scala
+7 −5 src/main/scala/viper/gobra/frontend/info/base/SymbolTable.scala
+10 −8 src/main/scala/viper/gobra/frontend/info/base/Type.scala
+3 −15 src/main/scala/viper/gobra/frontend/info/implementation/property/Assignability.scala
+4 −3 src/main/scala/viper/gobra/frontend/info/implementation/property/Implements.scala
+0 −1 src/main/scala/viper/gobra/frontend/info/implementation/property/TypeIdentity.scala
+33 −37 src/main/scala/viper/gobra/frontend/info/implementation/property/TypeMerging.scala
+2 −0 src/main/scala/viper/gobra/frontend/info/implementation/resolution/AdvancedMemberSet.scala
+5 −4 src/main/scala/viper/gobra/frontend/info/implementation/resolution/AmbiguityResolution.scala
+49 −11 src/main/scala/viper/gobra/frontend/info/implementation/resolution/MemberResolution.scala
+48 −7 src/main/scala/viper/gobra/frontend/info/implementation/resolution/NameResolution.scala
+9 −4 src/main/scala/viper/gobra/frontend/info/implementation/typing/ExprTyping.scala
+1 −1 src/main/scala/viper/gobra/frontend/info/implementation/typing/IdTyping.scala
+3 −3 src/main/scala/viper/gobra/frontend/info/implementation/typing/TypeTyping.scala
+12 −8 src/main/scala/viper/gobra/frontend/info/implementation/typing/ghost/GhostExprTyping.scala
+3 −9 src/main/scala/viper/gobra/frontend/info/implementation/typing/ghost/GhostIdTyping.scala
+10 −4 src/main/scala/viper/gobra/frontend/info/implementation/typing/ghost/GhostMiscTyping.scala
+1 −1 src/main/scala/viper/gobra/frontend/info/implementation/typing/ghost/GhostStmtTyping.scala
+24 −3 src/main/scala/viper/gobra/frontend/info/implementation/typing/ghost/GhostTypeTyping.scala
+65 −11 src/main/scala/viper/gobra/translator/encodings/adts/AdtEncoding.scala
+9 −9 src/main/scala/viper/gobra/translator/encodings/sequences/SequenceEncoding.scala
+12 −12 src/main/scala/viper/gobra/translator/encodings/sets/SetEncoding.scala
+2 −2 src/main/scala/viper/gobra/translator/util/ViperWriter.scala
+26 −0 src/test/resources/regressions/issues/000589.gobra
+19 −0 src/test/resources/regressions/issues/000641.gobra
+22 −1 src/test/resources/regressions/issues/000655.gobra
+8 −0 src/test/resources/regressions/issues/000655/pkg/f.gobra
+23 −0 src/test/resources/regressions/issues/000685.gobra
+23 −0 src/test/resources/regressions/issues/000686-1.gobra
+18 −0 src/test/resources/regressions/issues/000686-2.gobra
+19 −0 src/test/resources/regressions/issues/000686-3.gobra
+16 −0 src/test/resources/regressions/issues/000686-4.gobra
+16 −0 src/test/resources/regressions/issues/000686-5.gobra
+12 −0 src/test/resources/regressions/issues/000686-6.gobra
+52 −25 src/test/scala/viper/gobra/ast/InternalPrettyPrinterUnitTests.scala

0 comments on commit 6613283

Please sign in to comment.