Merge pull request #156 from JSAbrahams/type-checker

First version of the type checker

.appveyor.yml

@@ -9,10 +9,6 @@ branches:
 
 environment:
   matrix:
-  # Stable 64-bit MSVC
-    - channel: stable
-      PYTHON: "C:\\Python37"
-      target: x86_64-pc-windows-msvc
   # Nightly 64-bit MSVC
     - channel: nightly
       PYTHON: "C:\\Python37"
@@ -27,8 +23,9 @@ install:
 
   - if %channel% == "nightly" rustup install nightly
 
-  - if %channel% == "nightly"  rustup component add rustfmt --toolchain nightly
+  - if %channel% == "nightly" rustup component add rustfmt --toolchain nightly
   - if %channel% == "stable" rustup component add clippy
+  - if %channel% == "nightly" rustup component add clippy --toolchain nightly
 
   - rustc -vV
   - cargo -vV
@@ -38,6 +35,7 @@ build: false
 test_script:
   - if %channel% == "nightly" cargo +nightly fmt --all -- --check
   - if %channel% == "stable" cargo clippy -- -D warnings
+  - if %channel% == "nightly" cargo +nightly clippy -- -D warnings
 
   - cargo test --verbose
 

.codacy.yml

@@ -1,2 +1,2 @@
 exclude_paths:
-  - 'tests/resources/**'
+  - '**/*.py'

.travis.yml

@@ -4,12 +4,11 @@ os:
 
 language: rust
 rust:
-  - stable
   - nightly
 
 dist: xenial
 python:
-  - "3.7"
+  - "3.8"
 
 # cache dependencies
 before_cache:
@@ -20,8 +19,6 @@ cache:
     - if [ $TRAVIS_OS_NAME = 'osx' ]; then $HOME/Library/Caches/Homebrew; fi
 
 sudo: true
-before_install:
-  - sudo apt-get update
 
 addons:
   apt:
@@ -38,14 +35,24 @@ branches:
     - master
 
 before_script:
-  # Python
-  - if [ $TRAVIS_OS_NAME = 'linux' ]; then sudo apt-get install python3; fi
-
   # Cargo components
   - if [ $TRAVIS_RUST_VERSION = 'nightly' AND $TRAVIS_OS_NAME = 'linux' ]; then rustup component add rustfmt --toolchain nightly; fi
   - if [ $TRAVIS_RUST_VERSION = 'stable' AND $TRAVIS_OS_NAME = 'linux' ]; then rustup component add clippy; fi
+  - if [ $TRAVIS_RUST_VERSION = 'nightly' AND $TRAVIS_OS_NAME = 'linux' ]; then rustup component add clippy --toolchain nightly; fi
 
 before_install:
+  # Python
+  - python3 --version
+  - |
+    if [ $TRAVIS_OS_NAME = 'linux' ]; then
+      sudo apt update;
+      sudo apt install software-properties-common;
+      sudo add-apt-repository -y ppa:deadsnakes/ppa;
+      sudo apt-get update;
+      sudo apt-get install python3.8;
+    fi
+  - python3 --version
+
   # grcov
   - curl -L https://github.com/mozilla/grcov/releases/download/v0.4.1/grcov-linux-x86_64.tar.bz2 | tar jxf -
 
@@ -55,6 +62,7 @@ after_success:
 
 script:
   - if [ $TRAVIS_RUST_VERSION = 'stable' AND $TRAVIS_OS_NAME = 'linux' ]; then cargo clippy -- -D warnings; fi
+  - if [ $TRAVIS_RUST_VERSION = 'nightly' AND $TRAVIS_OS_NAME = 'linux' ]; then cargo +nightly clippy -- -D warnings; fi
   - if [ $TRAVIS_RUST_VERSION = 'nightly' AND $TRAVIS_OS_NAME = 'linux' ]; then cargo +nightly fmt --all -- --check; fi
 
   - cargo build

Cargo.toml

@@ -1,10 +1,9 @@
 [package]
 name = "mamba"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Joel Abrahams <[email protected]>"]
 description = "A transpiler which translates Mamba to Python 3 files"
 edition = "2018"
-license = "MIT"
 license-file = "LICENSE"
 
 readme = "README.md"

src/common/mod.rs

@@ -0,0 +1 @@
+pub mod position;

src/common/position.rs

@@ -0,0 +1,72 @@
+use std::cmp::{max, min};
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+/// A position represents a rectangle in the source code.
+pub struct Position {
+    pub start: CaretPos,
+    pub end:   CaretPos
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+/// An endpoint represents either the top left or bottom right points of a
+/// [Position] rectangle.
+///
+/// Line's and position's are 1-indexed.
+pub struct CaretPos {
+    pub line: i32,
+    pub pos:  i32
+}
+
+impl Position {
+    pub fn new(start: &CaretPos, end: &CaretPos) -> Position {
+        Position { start: start.clone(), end: end.clone() }
+    }
+
+    /// Get the absolute width of a position, which represents a rectangle in
+    /// the source code.
+    ///
+    /// Width is always 1 or greater.
+    pub fn get_width(&self) -> i32 {
+        max(1, max(self.end.pos - self.start.pos, self.start.pos - self.end.pos))
+    }
+
+    pub fn union(&self, other: &Position) -> Position {
+        Position {
+            start: CaretPos {
+                line: min(self.start.line, other.start.line),
+                pos:  min(self.start.pos, other.start.pos)
+            },
+            end:   CaretPos {
+                line: max(self.end.line, other.end.line),
+                pos:  max(self.end.pos, other.end.pos)
+            }
+        }
+    }
+}
+
+impl CaretPos {
+    /// Create new endpoint with given line and position.
+    pub fn new(line: i32, pos: i32) -> CaretPos { CaretPos { line, pos } }
+
+    /// Create new [EndPoint] which is offset in the vertical direction by the
+    /// given amount.
+    pub fn offset_line(self, offset: i32) -> CaretPos {
+        CaretPos { line: self.line + offset, pos: self.pos }
+    }
+
+    /// Create new [EndPoint] which is offset in the horizontal direction by the
+    /// given amount.
+    pub fn offset_pos(self, offset: i32) -> CaretPos {
+        CaretPos { line: self.line, pos: self.pos + offset }
+    }
+
+    pub fn newline(self) -> CaretPos { CaretPos { line: self.line + 1, pos: 1 } }
+}
+
+impl Default for Position {
+    fn default() -> Self { Position { start: CaretPos::default(), end: CaretPos::default() } }
+}
+
+impl Default for CaretPos {
+    fn default() -> Self { CaretPos { line: 1, pos: 1 } }
+}