Make incognito a CodeFlag bit

coolreader18 · coolreader18 · commit be565d30ae90 · 2020-04-03T12:34:00.000-05:00
diff --git a/bytecode/src/bytecode.rs b/bytecode/src/bytecode.rs
@@ -46,18 +46,18 @@ pub struct CodeObject {
     pub source_path: String,
     pub first_line_number: usize,
     pub obj_name: String, // Name of the object that created this code object
-    pub incognito: bool,
 }
 
 bitflags! {
     #[derive(Serialize, Deserialize)]
-    pub struct CodeFlags: u8 {
+    pub struct CodeFlags: u16 {
         const HAS_DEFAULTS = 0x01;
         const HAS_KW_ONLY_DEFAULTS = 0x02;
         const HAS_ANNOTATIONS = 0x04;
         const NEW_LOCALS = 0x08;
         const IS_GENERATOR = 0x10;
         const IS_COROUTINE = 0x20;
+        const INCOGNITO = 1 << 15;
     }
 }
 
@@ -394,7 +394,6 @@ impl CodeObject {
             source_path,
             first_line_number,
             obj_name,
-            incognito: false,
         }
     }
 
@@ -451,6 +450,10 @@ impl CodeObject {
         }
         Display(self)
     }
+
+    pub fn incognito(&self) -> bool {
+        self.flags.contains(CodeFlags::INCOGNITO)
+    }
 }
 
 impl fmt::Display for CodeObject {
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -189,7 +189,8 @@ impl<O: OutputStream> Compiler<O> {
     }
 
     fn push_output(&mut self, mut code: CodeObject) {
-        code.incognito = self.opts.incognito;
+        code.flags
+            .set(bytecode::CodeFlags::INCOGNITO, self.opts.incognito);
         self.output_stack.push(code.into());
     }
 
diff --git a/vm/src/obj/objcode.rs b/vm/src/obj/objcode.rs
@@ -103,7 +103,7 @@ impl PyCodeRef {
     }
 
     #[pyproperty]
-    fn co_flags(self) -> u8 {
+    fn co_flags(self) -> u16 {
         self.code.flags.bits()
     }
 }
diff --git a/vm/src/obj/objframe.rs b/vm/src/obj/objframe.rs
@@ -31,7 +31,7 @@ impl FrameRef {
 
     #[pyproperty]
     fn f_globals(self, vm: &VirtualMachine) -> PyResult<PyDictRef> {
-        if self.code.incognito {
+        if self.code.incognito() {
             Err(vm.new_type_error("Can't get f_globals on an incognito frame".to_owned()))
         } else {
             Ok(self.scope.globals.clone())
@@ -40,7 +40,7 @@ impl FrameRef {
 
     #[pyproperty]
     fn f_locals(self, vm: &VirtualMachine) -> PyResult<PyDictRef> {
-        if self.code.incognito {
+        if self.code.incognito() {
             Err(vm.new_type_error("Can't get f_locals on an incognito frame".to_owned()))
         } else {
             Ok(self.scope.get_locals())
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -281,7 +281,7 @@ impl PyFunction {
 
     #[pyproperty(magic)]
     fn globals(&self, vm: &VirtualMachine) -> PyResult<PyDictRef> {
-        if self.code.incognito {
+        if self.code.incognito() {
             Err(vm.new_type_error("Can't get __globals__ on an incognito function".to_owned()))
         } else {
             Ok(self.scope.globals.clone())

Original file line number	Diff line number	Diff line change
`@@ -46,18 +46,18 @@ pub struct CodeObject {`
`46`	`46`	`pub source_path: String,`
`47`	`47`	`pub first_line_number: usize,`
`48`	`48`	`pub obj_name: String, // Name of the object that created this code object`
`49`		`- pub incognito: bool,`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`bitflags! {`
`53`	`52`	`#[derive(Serialize, Deserialize)]`
`54`		`- pub struct CodeFlags: u8 {`
	`53`	`+ pub struct CodeFlags: u16 {`
`55`	`54`	`const HAS_DEFAULTS = 0x01;`
`56`	`55`	`const HAS_KW_ONLY_DEFAULTS = 0x02;`
`57`	`56`	`const HAS_ANNOTATIONS = 0x04;`
`58`	`57`	`const NEW_LOCALS = 0x08;`
`59`	`58`	`const IS_GENERATOR = 0x10;`
`60`	`59`	`const IS_COROUTINE = 0x20;`
	`60`	`+ const INCOGNITO = 1 << 15;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -394,7 +394,6 @@ impl CodeObject {`
`394`	`394`	`source_path,`
`395`	`395`	`first_line_number,`
`396`	`396`	`obj_name,`
`397`		`- incognito: false,`
`398`	`397`	`}`
`399`	`398`	`}`
`400`	`399`
`@@ -451,6 +450,10 @@ impl CodeObject {`
`451`	`450`	`}`
`452`	`451`	`Display(self)`
`453`	`452`	`}`
	`453`	`+`
	`454`	`+ pub fn incognito(&self) -> bool {`
	`455`	`+ self.flags.contains(CodeFlags::INCOGNITO)`
	`456`	`+ }`
`454`	`457`	`}`
`455`	`458`
`456`	`459`	`impl fmt::Display for CodeObject {`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ impl<O: OutputStream> Compiler<O> {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`fn push_output(&mut self, mut code: CodeObject) {`
`192`		`- code.incognito = self.opts.incognito;`
	`192`	`+ code.flags`
	`193`	`+ .set(bytecode::CodeFlags::INCOGNITO, self.opts.incognito);`
`193`	`194`	`self.output_stack.push(code.into());`
`194`	`195`	`}`
`195`	`196`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ impl PyCodeRef {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`#[pyproperty]`
`106`		`- fn co_flags(self) -> u8 {`
	`106`	`+ fn co_flags(self) -> u16 {`
`107`	`107`	`self.code.flags.bits()`
`108`	`108`	`}`
`109`	`109`	`}`