Skip to content

media-params: get rid of string/token distinction #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
seliopou wants to merge 2 commits into from
Closed

media-params: get rid of string/token distinction #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098b948
media-params: get rid of string/token distinction
seliopou Mar 25, 2017
29a0275
media-params: fix tests
seliopou Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/accept.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ let languages = function

let rec string_of_pl = function
| [] -> ""
| (k,T v)::r -> sprintf ";%s=%s%s" k v (string_of_pl r)
| (k,S v)::r -> sprintf ";%s=\"%s\"%s" k (Stringext.quote v) (string_of_pl r)
| (k, v)::r ->
let e = Stringext.quote v in
if v = e
then sprintf ";%s=%s%s" k v (string_of_pl r)
else sprintf ";%s=\"%s\"%s" k e (string_of_pl r)

let accept_el el pl q =
sprintf "%s;q=%.3f%s" el ((float q)/.1000.) (string_of_pl pl)
Expand Down
8 changes: 2 additions & 6 deletions lib/accept.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ type 'a qlist = (q * 'a) list [@@deriving sexp]
*)
val qsort : 'a qlist -> 'a qlist

type pv = Accept_types.pv =
T of string
| S of string [@@deriving sexp]

type p = string * pv [@@deriving sexp]
type p = string * string [@@deriving sexp]

type media_range =
Accept_types.media_range =
Expand Down Expand Up @@ -73,7 +69,7 @@ val encodings : string option -> encoding qlist

val languages : string option -> language qlist

val string_of_media_range : media_range * (string * pv) list -> q -> string
val string_of_media_range : media_range * p list -> q -> string
val string_of_charset : charset -> q -> string
val string_of_encoding : encoding -> q -> string
val string_of_language : language -> q -> string
Expand Down
6 changes: 3 additions & 3 deletions lib/accept_parser.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
%{
open Accept_types

type param = Q of int | Kv of (string * pv)
type param = Q of int | Kv of p

let rec get_q = function
| (Q q)::_ -> q
Expand All @@ -40,11 +40,11 @@
%%

param :
| SEMI TOK EQUAL QS { Kv ($2, S $4) }
| SEMI TOK EQUAL QS { Kv ($2, $4) }
| SEMI TOK EQUAL TOK {
if $2="q" then try Q (truncate (1000.*.(float_of_string $4)))
with Failure "float_of_string" -> raise Parsing.Parse_error
else Kv ($2, T $4)
else Kv ($2, $4)
}

params :
Expand Down
3 changes: 1 addition & 2 deletions lib/accept_types.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

open Sexplib.Std

type pv = T of string | S of string [@@deriving sexp]
type p = string * pv [@@deriving sexp]
type p = string * string [@@deriving sexp]
type media_range =
| MediaType of string * string
| AnyMediaSubtype of string
Expand Down
10 changes: 5 additions & 5 deletions lib_test/test_accept.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ let valid_media_ranges = [
1000,(A.AnyMediaSubtype "text",[]);
];
"text/plain; q=0.8; charset=utf-8,text/HTML;charset=utf-8;q=0.9", [
800,(A.MediaType ("text","plain"),["charset",A.T"utf-8"]);
900,(A.MediaType ("text","html"),["charset",A.T"utf-8"]);
800,(A.MediaType ("text","plain"),["charset","utf-8"]);
900,(A.MediaType ("text","html"),["charset","utf-8"]);
];
"text/*;foo=\"bar\"", [1000,(A.AnyMediaSubtype "text",["foo",A.S"bar"])];
"*/*;qu=\"\\\"\"", [1000,(A.AnyMedia,["qu",A.S"\""])];
"*/*;f=\";q=0,text/plain\"", [1000,(A.AnyMedia,["f",A.S";q=0,text/plain"])];
"text/*;foo=\"bar\"", [1000,(A.AnyMediaSubtype "text",["foo","bar"])];
"*/*;qu=\"\\\"\"", [1000,(A.AnyMedia,["qu","\""])];
"*/*;f=\";q=0,text/plain\"", [1000,(A.AnyMedia,["f",";q=0,text/plain"])];
]

let valid_media_ranges_suite =
Expand Down