Migrate resolver to use copy-free parser

This is a massive rewrite of the whole crate.

It separates out three crates:
fluent-syntax becomes a zero-copy AST+parser(+serialized in the future)
compabile with Fluent 0.8
fluent-bundle becomes aligned with fluent-bundle in JS
fluent becomes a top-level crate with added simple ResourceManager.

All of the code is compatible with current stable Rust 2018.

Author: Zibi Braniecki

.gitignore

@@ -1,3 +1,4 @@
 /target/
+*/target/
 **/*.rs.bk
 Cargo.lock

Cargo.toml

@@ -1,5 +1,7 @@
 [workspace]
 members = [
+    "fluent-syntax",
+    "fluent-bundle",
+    "fluent-cli",
     "fluent",
-    "fluent-syntax"
 ]

fluent/CHANGELOG.md renamed to fluent-bundle/CHANGELOG.md

@@ -0,0 +1,25 @@
+[package]
+name = "fluent-bundle"
+description = """
+A localization system designed to unleash the entire expressive power of
+natural language translations.
+"""
+version = "0.4.3"
+edition = "2018"
+authors = [
+    "Zibi Braniecki <[email protected]>",
+    "Staś Małolepszy <[email protected]>"
+]
+homepage = "http://www.projectfluent.org"
+license = "Apache-2.0/MIT"
+repository = "https://github.com/projectfluent/fluent-rs"
+readme = "README.md"
+keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
+categories = ["localization", "internationalization"]
+
+[dependencies]
+fluent-locale = "^0.4.1"
+fluent-syntax = { path = "../fluent-syntax" }
+failure = "0.1"
+failure_derive = "0.1"
+intl_pluralrules = "1.0"

fluent-bundle/Cargo.toml

@@ -24,7 +24,7 @@ Usage
 ```rust
 extern crate fluent;
 
-use fluent::FluentBundle;
+use fluent_bundle::FluentBundle;
 
 fn main() {
     let mut bundle = FluentBundle::new(&["en-US"]);

fluent/README.md renamed to fluent-bundle/README.md

@@ -1,20 +1,18 @@
 #![feature(test)]
 
-extern crate fluent;
-extern crate fluent_syntax;
 extern crate test;
 
-use fluent::bundle::FluentBundle;
+use fluent_bundle::bundle::FluentBundle;
 use fluent_syntax::{ast, parser::parse};
 use std::fs::File;
 use std::io;
 use std::io::Read;
 use test::Bencher;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
-    let mut f = try!(File::open(path));
+    let mut f = File::open(path)?;
     let mut s = String::new();
-    try!(f.read_to_string(&mut s));
+    f.read_to_string(&mut s)?;
     Ok(s)
 }
 
@@ -27,7 +25,9 @@ fn bench_simple_format(b: &mut Bencher) {
 
     for entry in resource.body {
         match entry {
-            ast::Entry::Message(ast::Message { id, .. }) => ids.push(id.name),
+            ast::ResourceEntry::Entry(ast::Entry::Message(ast::Message { id, .. })) => {
+                ids.push(id.name)
+            }
             _ => continue,
         };
     }
@@ -37,7 +37,7 @@ fn bench_simple_format(b: &mut Bencher) {
 
     b.iter(|| {
         for id in &ids {
-            bundle.format(id.as_str(), None);
+            bundle.format(id, None);
         }
     });
 }
@@ -51,7 +51,9 @@ fn bench_menubar_format(b: &mut Bencher) {
 
     for entry in resource.body {
         match entry {
-            ast::Entry::Message(ast::Message { id, .. }) => ids.push(id.name),
+            ast::ResourceEntry::Entry(ast::Entry::Message(ast::Message { id, .. })) => {
+                ids.push(id.name)
+            }
             _ => continue,
         };
     }
@@ -66,7 +68,7 @@ fn bench_menubar_format(b: &mut Bencher) {
             // widgets may only expect attributes and they shouldn't be forced to display a value.
             // Here however it doesn't matter because we know for certain that the message for `id`
             // exists.
-            bundle.format_message(id.as_str(), None);
+            bundle.format_message(id, None);
         }
     });
 }

fluent/benches/lib.rs renamed to fluent-bundle/benches/lib.rs

@@ -1,7 +1,5 @@
-extern crate fluent;
-
-use fluent::bundle::FluentBundle;
-use fluent::types::FluentValue;
+use fluent_bundle::bundle::FluentBundle;
+use fluent_bundle::types::FluentValue;
 use std::collections::HashMap;
 
 fn main() {
@@ -17,7 +15,8 @@ unread-emails =
        *[other] You have { $emailCount } unread emails
     }
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     let mut args = HashMap::new();
     args.insert("name", FluentValue::from("John"));

fluent/benches/menubar.ftl renamed to fluent-bundle/benches/menubar.ftl

@@ -1,7 +1,5 @@
-extern crate fluent;
-
-use fluent::bundle::FluentBundle;
-use fluent::types::FluentValue;
+use fluent_bundle::bundle::FluentBundle;
+use fluent_bundle::types::FluentValue;
 
 fn main() {
     let mut bundle = FluentBundle::new(&["en-US"]);
@@ -10,7 +8,8 @@ fn main() {
     bundle
         .add_function("HELLO", |_args, _named_args| {
             return Some("I'm a function!".into());
-        }).unwrap();
+        })
+        .unwrap();
 
     // Test for a function that accepts unnamed positional arguments
     bundle
@@ -22,7 +21,8 @@ fn main() {
             }
 
             None
-        }).unwrap();
+        })
+        .unwrap();
 
     // Test for a function that accepts named arguments
     bundle
@@ -35,7 +35,8 @@ fn main() {
                 }
                 _ => None,
             };
-        }).unwrap();
+        })
+        .unwrap();
 
     bundle
         .add_messages("hello-world = Hey there! { HELLO() }")

fluent/benches/simple.ftl renamed to fluent-bundle/benches/simple.ftl

@@ -1,6 +1,4 @@
-extern crate fluent;
-
-use fluent::bundle::FluentBundle;
+use fluent_bundle::bundle::FluentBundle;
 
 fn main() {
     let mut bundle = FluentBundle::new(&["en-US"]);

fluent/examples/README.md renamed to fluent-bundle/examples/README.md

@@ -1,6 +1,4 @@
-extern crate fluent;
-
-use fluent::bundle::FluentBundle;
+use fluent_bundle::bundle::FluentBundle;
 
 fn main() {
     let mut bundle = FluentBundle::new(&["x-testing"]);
@@ -11,7 +9,8 @@ foo = Foo
 foobar = { foo } Bar
 bazbar = { baz } Bar
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     match bundle.format("foobar", None) {
         Some((value, _)) => println!("{}", value),

fluent/examples/external_arguments.rs renamed to fluent-bundle/examples/external_arguments.rs

@@ -0,0 +1,7 @@
+missing-arg-error = Error: Please provide a number as argument.
+input-parse-error = Error: Could not parse input `{ $input }`. Reason: { $reason }
+response-msg =
+    { $value ->
+        [one] "{ $input }" has one Collatz step.
+       *[other] "{ $input }" has { $value } Collatz steps.
+    }

fluent/examples/functions.rs renamed to fluent-bundle/examples/functions.rs

@@ -0,0 +1,8 @@
+missing-arg-error = Błąd: Proszę wprowadzić liczbę jako argument.
+input-parse-error = Błąd: Nie udało się sparsować `{ $input }`. Powód: { $reason } 
+response-msg =
+    { $value ->
+        [one] "{ $input }" ma jeden krok Collatza.
+        [few] "{ $input }" ma { $value } kroki Collatza.
+       *[many] "{ $input }" ma { $value } kroków Collatza.
+    }

fluent/examples/hello.rs renamed to fluent-bundle/examples/hello.rs

@@ -1,7 +1,5 @@
-extern crate fluent;
-
-use fluent::bundle::FluentBundle;
-use fluent::types::FluentValue;
+use fluent_bundle::bundle::FluentBundle;
+use fluent_bundle::types::FluentValue;
 use std::collections::HashMap;
 
 fn main() {
@@ -19,7 +17,8 @@ hello-world2 = Hello { $name ->
         [moon] Moon
     }
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     match bundle.format("hello-world", None) {
         Some((value, _)) => println!("{}", value),