fix the submodule conflit and fix the coq import bug

Ajay Kumar Eeralla · Ajay Kumar Eeralla · commit 919d605d48ee · 2021-02-23T18:27:02.000-08:00
diff --git a/src/SAWScript/Prover/Exporter.hs b/src/SAWScript/Prover/Exporter.hs
@@ -280,7 +280,7 @@ coqTranslationConfiguration notations skips = Coq.TranslationConfiguration
   { Coq.notations          = notations
   , Coq.monadicTranslation = False
   , Coq.skipDefinitions    = skips
-  , Coq.vectorModule       = "SAWVectorsAsCoqVectors"
+  , Coq.vectorModule       = "SAWCoreVectorsAsCoqVectors"
   }
 
 writeCoqTerm ::

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ coqTranslationConfiguration notations skips = Coq.TranslationConfiguration`
`280`	`280`	`{ Coq.notations = notations`
`281`	`281`	`, Coq.monadicTranslation = False`
`282`	`282`	`, Coq.skipDefinitions = skips`
`283`		`- , Coq.vectorModule = "SAWVectorsAsCoqVectors"`
	`283`	`+ , Coq.vectorModule = "SAWCoreVectorsAsCoqVectors"`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`writeCoqTerm ::`