brotorift 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce2b5ca6a02afec4e1814db55786bf2a2d7872cddebe3d45b84e03d6c1cd6c31
-  data.tar.gz: ea893b80ffd9db7ead1cf84f3d88293583d2b8de42e5bae4a9ad3c1898a862bf
+  metadata.gz: b35c5012c15f8bb488f1544b7ff131d8d3464fe2b5ce0c859139ffd3065bc92e
+  data.tar.gz: 9f645f7f92fba074526292136e4bc72fb4b6f66376e5f026201d9411c7a5d8cc
 SHA512:
-  metadata.gz: c993122fa2c179935e7d3dff49cd253f84b4b5414172bf2090055c2f81e71d757f41dce4acda7f51f56f3ac9afe53ce6cc33f4302bb63cd217b467d8eb70b8ae
-  data.tar.gz: d00343c272bca1e935bfe56d4ad4e82ce7981e32724fa453e97bc781953e86ae6ffc6889d113ed3a8aa7071a27f8828c09bdaff79e638d3e03e822e8b489d64f
+  metadata.gz: 53aa0520a38cde0a6a62367eccf92cf956c1ed0bc20a94a5a3e152be2fdacbf00fa5b112aa4efa7471f25d1ad9a90373051b6b77b2d6c4551bbf8ada7d2ef3d9
+  data.tar.gz: f7c8fd3dbd53e738389730af88e6f5e0af45d1761e3e903be34d6720c75c08052ae3bbe64d855e83feed8348c5222ea2ae26851638dc2ede078e39fcdd8dbae3

data/lib/compiler.rb

@@ -24,10 +24,6 @@ class Compiler
 	end
 
 	def compile filename
-		@runtime = self.compile_file filename
-	end
-
-	def compile_file filename
 		content = File.read filename, encoding: 'utf-8'
 		tokens = Lexer::lex content, filename
 		begin
@@ -36,9 +32,8 @@ class Compiler
 			add_error UnexpectedTokenError.new e.current
 			return
 		end
-		runtime = Runtime.new filename
-		self.compile_ast runtime, ast
-		runtime
+		@runtime = Runtime.new filename if @runtime == nil
+		self.compile_ast @runtime, ast
 	end
 
 	def compile_ast runtime, ast
@@ -71,8 +66,7 @@ class Compiler
 			add_error IncludeFileNotFoundError.new filename, include_ast.position
 			return
 		end
-		include_runtime = self.compile_file filename
-		@runtime.add_include include_runtime
+		self.compile filename
 	end
 
 	def compile_enum enum_ast

data/lib/runtime.rb

@@ -193,7 +193,6 @@ class Runtime
 	attr_reader :structs
 	attr_reader :directions
 	attr_reader :sequences
-	attr_reader :includes
 
 	def initialize filename
 		@filename = filename
@@ -203,7 +202,6 @@ class Runtime
 		@structs = {}
 		@directions = []
 		@sequences = {}
-		@includes = []
 
 		self.init_builtins
 	end
@@ -256,11 +254,6 @@ class Runtime
 		type_def = @structs[name]
 		return type_def, self if type_def != nil
 
-		@includes.each do |i|
-			type_def = i.get_type name
-			return type_def, i if type_def != nil
-		end
-
 		return nil, self
 	end
 
@@ -272,11 +265,6 @@ class Runtime
 		dir = @directions.find { |d| d.client == client and d.server == server and d.direction == direction }
 		return dir if dir != nil
 
-		@includes.each do |i|
-			dir = i.get_direction client, direction, server
-			return dir if dir != nil
-		end
-
 		return nil
 	end
 
@@ -288,18 +276,9 @@ class Runtime
 		sequence = @sequences[name]
 		return sequence if sequence != nil
 
-		@includes.each do |i|
-			sequence = i.get_sequence name
-			return sequence if sequence != nil
-		end
-
 		return nil
 	end
 
-	def add_include runtime
-		@includes.push runtime
-	end
-
 	def get_node_directions node, side
 		node_directions = {}
 		@directions.each do |direction|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brotorift
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Peter Ren
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: filigree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Brotorift generator
 email: lcdcdr2004@gmail.com
 executables: