Remove BAD_URL

Author: davesnx

packages/parser/lib/Lexer.re

@@ -517,6 +517,10 @@ let rec consume_remnants_bad_url = lexbuf =>
 
 // https://drafts.csswg.org/css-syntax-3/#consume-url-token
 let consume_url = lexbuf => {
+  let raise_bad_url = error => {
+    let (start_pos, curr_pos) = Sedlexing.lexing_positions(lexbuf);
+    raise(LexingError((start_pos, curr_pos, Tokens.show_error(error))));
+  };
   let _ = consume_whitespace(lexbuf);
   let rec read = acc => {
     let when_whitespace = () => {
@@ -526,7 +530,7 @@ let consume_url = lexbuf => {
       | eof => Error((Tokens.URL(acc), Tokens.Eof))
       | _ =>
         consume_remnants_bad_url(lexbuf);
-        Ok(Tokens.BAD_URL);
+        raise_bad_url(Tokens.Invalid_code_point);
       };
     };
     switch%sedlex (lexbuf) {
@@ -538,12 +542,11 @@ let consume_url = lexbuf => {
     | '('
     | non_printable_code_point =>
       consume_remnants_bad_url(lexbuf);
-      // TODO: location on error
-      Error((Tokens.BAD_URL, Tokens.Invalid_code_point));
+      raise_bad_url(Tokens.Invalid_code_point);
     | escape =>
       switch (consume_escaped(lexbuf)) {
       | Ok(char) => read(acc ++ char)
-      | Error((_, error)) => Error((Tokens.BAD_URL, error))
+      | Error((_, error)) => raise_bad_url(error)
       }
     | any => read(acc ++ lexeme(lexbuf))
     | _ => unreachable(lexbuf)
@@ -738,6 +741,10 @@ let consume_number = lexbuf => {
 
 // https://drafts.csswg.org/css-syntax-3/#consume-url-token
 let consume_url_ = lexbuf => {
+  let raise_bad_url = error => {
+    let (start_pos, curr_pos) = Sedlexing.lexing_positions(lexbuf);
+    raise(LexingError((start_pos, curr_pos, Tokens.show_error(error))));
+  };
   let _ = consume_whitespace_(lexbuf);
   let rec read = acc => {
     let when_whitespace = () => {
@@ -747,7 +754,7 @@ let consume_url_ = lexbuf => {
       | eof => Error((Tokens.URL(acc), Tokens.Eof))
       | _ =>
         consume_remnants_bad_url(lexbuf);
-        Ok(BAD_URL);
+        raise_bad_url(Tokens.Invalid_code_point);
       };
     };
     switch%sedlex (lexbuf) {
@@ -759,12 +766,11 @@ let consume_url_ = lexbuf => {
     | '('
     | non_printable_code_point =>
       consume_remnants_bad_url(lexbuf);
-      // TODO: location on error
-      Error((BAD_URL, Tokens.Invalid_code_point));
+      raise_bad_url(Tokens.Invalid_code_point);
     | escape =>
       switch (consume_escaped(lexbuf)) {
       | Ok(char) => read(acc ++ char)
-      | Error((_, error)) => Error((BAD_URL, error))
+      | Error((_, error)) => raise_bad_url(error)
       }
     | any => read(acc ++ lexeme(lexbuf))
     | _ => unreachable(lexbuf)

packages/parser/lib/Parser.mly

@@ -32,7 +32,6 @@ let make_loc = Parser_location.to_ppxlib_location
 %token <string> FUNCTION
 %token <string> NTH_FUNCTION
 %token <string> URL
-%token BAD_URL
 %token <string> AT_KEYFRAMES
 %token <string> AT_RULE
 %token <string> AT_RULE_STATEMENT

packages/parser/lib/Tokens.re

@@ -11,7 +11,6 @@ type token =
   | HASH(string)
   | STRING(string)
   | URL(string)
-  | BAD_URL
   | DELIM(string)
   | NUMBER(string)
   | FLOAT_DIMENSION((string, string))
@@ -65,7 +64,6 @@ let humanize =
   | HASH(h) => "hash: #" ++ h
   | STRING(s) => {|string "|} ++ s ++ {|"|}
   | URL(u) => "url(" ++ u ++ ")"
-  | BAD_URL => "bad url"
   | DELIM(d) => "delimiter " ++ d
   | NUMBER(n) => "number: " ++ n
   | FLOAT_DIMENSION((n, u)) => "dimension: " ++ n ++ u
@@ -106,7 +104,6 @@ let to_string =
   | HASH(s) => "#" ++ s
   | STRING(s) => "'" ++ s ++ "'"
   | URL(url) => "url(" ++ url ++ ")"
-  | BAD_URL => "bad url"
   | DELIM(s) => s
   | NUMBER(s) => s
   | FLOAT_DIMENSION((n, u)) => n ++ u
@@ -147,7 +144,6 @@ let to_debug =
   | HASH(s) => "HASH('" ++ s ++ "')"
   | STRING(s) => "STRING('" ++ s ++ "')"
   | URL(u) => "URL(" ++ u ++ ")"
-  | BAD_URL => "BAD_URL"
   | DELIM(s) => "DELIM('" ++ s ++ "')"
   | NUMBER(s) => "NUMBER('" ++ s ++ "')"
   | FLOAT_DIMENSION((n, u)) => "FLOAT_DIMENSION('" ++ n ++ ", " ++ u ++ "')"