Add new 2022 SI prefixes

sharkdp · Jul 6, 2023 · a935f00 · a935f00
1 parent 6205f66
commit a935f00
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/LICENSE_THIRDPARTY b/LICENSE_THIRDPARTY
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------------
-purescript-arrays 7.2.0
+purescript-arrays 7.2.1
 
 Copyright 2018 PureScript
 
@@ -1121,7 +1121,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -------------------------------------------------------------------------------------
-purescript-quantities 12.1.0
+purescript-quantities 12.2.0
 
 MIT License
 

diff --git a/packages.dhall b/packages.dhall
@@ -7,7 +7,7 @@ Need help? See the following resources:
 - Dhall language tour: https://docs.dhall-lang.org/tutorials/Language-Tour.html
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.15.8-20230528/packages.dhall
-        sha256:7f1ebc6968ebabae915640456faf98f52f5606189f48cb22305fbe008723f26c
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.9-20230629/packages.dhall
+        sha256:f91d36c7e4793fe4d7e042c57fef362ff3f9e9ba88454cd38686701e30bf545a
 
 in  upstream
diff --git a/src/Insect/Parser.purs b/src/Insect/Parser.purs
@@ -166,12 +166,20 @@ prefixDict = Dictionary
   , Q.yobi ==> ["yobi", "Yi"]
   , Q.atto ==> ["atto", "a"]
   , Q.femto ==> ["femto", "f"]
-  -- peta and mega have to be up here (before pico and milli) in order for the
-  -- prefixes ('p' and 'm') not to be parsed as 'pico' or 'milli'.
+  -- peta has to be up here (before pico) in order for the prefix ('p') not to
+  -- be parsed as 'pico'. This goes for mega through quetta too.
   , Q.peta ==> ["peta"]
   , Q.mega ==> ["mega"]
+  , Q.zetta ==> ["zetta"]
+  , Q.yotta ==> ["yotta"]
+  , Q.ronna ==> ["ronna"]
+  , Q.quetta ==> ["quetta"]
   , Q.pico ==> ["pico", "p"]
   , Q.nano ==> ["nano", "n"]
+  , Q.quecto ==> ["quecto", "q"]
+  , Q.ronto ==> ["ronto", "r"]
+  , Q.yocto ==> ["yocto", "y"]
+  , Q.zepto ==> ["zepto", "z"]
   , Q.micro ==> [ "micro"
                 , "u" -- u for micro
                 , "µ" -- Micro sign U+00B5
@@ -187,6 +195,10 @@ prefixDict = Dictionary
   , Q.tera ==> ["tera", "T"]
   , Q.peta ==> ["P"]
   , Q.exa ==> ["exa", "E"]
+  , Q.zetta ==> ["Z"]
+  , Q.yotta ==> ["Y"]
+  , Q.ronna ==> ["R"]
+  , Q.quetta ==> ["Q"]
   ]
 
 -- | Parse a SI or IEC prefix like `µ`, `G`, `pico` or `Ki`.

diff --git a/web/third-party-licenses.txt b/web/third-party-licenses.txt
@@ -990,7 +990,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -------------------------------------------------------------------------------------
-purescript-arrays 7.2.0
+purescript-arrays 7.2.1
 
 Copyright 2018 PureScript
 
@@ -2112,7 +2112,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -------------------------------------------------------------------------------------
-purescript-quantities 12.1.0
+purescript-quantities 12.2.0
 
 MIT License